Menu
▾
▴
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
|
|
From: Meik S. <acy...@ph...> - 2009-08-20 09:32:28
|
Author: acydburn
Date: Thu Aug 20 10:31:43 2009
New Revision: 10022
Log:
some whitespace changes
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_footer.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/search_body.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewtopic_print.html
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_footer.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_footer.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_footer.html Thu Aug 20 10:31:43 2009
***************
*** 18,24 ****
<span class="corners-bottom"><span></span></span></div>
</div>
!
<!--
We request you retain the full copyright notice below including the link to www.phpbb.com.
This not only gives respect to the large amount of time given freely by the developers
--- 18,24 ----
<span class="corners-bottom"><span></span></span></div>
</div>
!
<!--
We request you retain the full copyright notice below including the link to www.phpbb.com.
This not only gives respect to the large amount of time given freely by the developers
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html Thu Aug 20 10:31:43 2009
***************
*** 28,35 ****
phpBB style name: prosilver
Based on style: prosilver (this is the default phpBB3 style)
Original author: Tom Beddard ( http://www.subBlue.com/ )
! Modified by:
!
NOTE: This page was generated by phpBB, the free open-source bulletin board package.
The phpBB Group is not responsible for the content of this page and forum. For more information
about phpBB please visit http://www.phpbb.com
--- 28,35 ----
phpBB style name: prosilver
Based on style: prosilver (this is the default phpBB3 style)
Original author: Tom Beddard ( http://www.subBlue.com/ )
! Modified by:
!
NOTE: This page was generated by phpBB, the free open-source bulletin board package.
The phpBB Group is not responsible for the content of this page and forum. For more information
about phpBB please visit http://www.phpbb.com
***************
*** 119,125 ****
<div id="search-box">
<form action="{U_SEARCH}" method="post" id="search">
<fieldset>
! <input name="keywords" id="keywords" type="text" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search" value="<!-- IF SEARCH_WORDS-->{SEARCH_WORDS}<!-- ELSE -->{L_SEARCH_MINI}<!-- ENDIF -->" onclick="if(this.value=='{LA_SEARCH_MINI}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_MINI}';" />
<input class="button2" value="{L_SEARCH}" type="submit" /><br />
<a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH_ADV}</a> {S_SEARCH_HIDDEN_FIELDS}
</fieldset>
--- 119,125 ----
<div id="search-box">
<form action="{U_SEARCH}" method="post" id="search">
<fieldset>
! <input name="keywords" id="keywords" type="text" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search" value="<!-- IF SEARCH_WORDS-->{SEARCH_WORDS}<!-- ELSE -->{L_SEARCH_MINI}<!-- ENDIF -->" onclick="if(this.value=='{LA_SEARCH_MINI}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_MINI}';" />
<input class="button2" value="{L_SEARCH}" type="submit" /><br />
<a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH_ADV}</a> {S_SEARCH_HIDDEN_FIELDS}
</fieldset>
***************
*** 148,154 ****
<ul class="linklist leftside">
<li class="icon-ucp">
<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
! <!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a>)<!-- ENDIF --> •
<a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a>
<!-- IF U_RESTORE_PERMISSIONS --> •
<a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a>
--- 148,154 ----
<ul class="linklist leftside">
<li class="icon-ucp">
<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
! <!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a>)<!-- ENDIF --> •
<a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a>
<!-- IF U_RESTORE_PERMISSIONS --> •
<a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a>
***************
*** 173,179 ****
<a name="start_here"></a>
<div id="page-body">
! <!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN and (U_MCP or U_ACP) -->
<div id="information" class="rules">
<div class="inner"><span class="corners-top"><span></span></span>
<strong>{L_INFORMATION}:</strong> {L_BOARD_DISABLED}
--- 173,179 ----
<a name="start_here"></a>
<div id="page-body">
! <!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN and (U_MCP or U_ACP) -->
<div id="information" class="rules">
<div class="inner"><span class="corners-top"><span></span></span>
<strong>{L_INFORMATION}:</strong> {L_BOARD_DISABLED}
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/search_body.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/search_body.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/search_body.html Thu Aug 20 10:31:43 2009
***************
*** 7,13 ****
<div class="panel">
<div class="inner"><span class="corners-top"><span></span></span>
<h3>{L_SEARCH_QUERY}</h3>
!
<fieldset>
<dl>
<dt><label for="keywords">{L_SEARCH_KEYWORDS}:</label><br /><span>{L_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
--- 7,13 ----
<div class="panel">
<div class="inner"><span class="corners-top"><span></span></span>
<h3>{L_SEARCH_QUERY}</h3>
!
<fieldset>
<dl>
<dt><label for="keywords">{L_SEARCH_KEYWORDS}:</label><br /><span>{L_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
***************
*** 28,34 ****
<div class="inner"><span class="corners-top"><span></span></span>
<h3>{L_SEARCH_OPTIONS}</h3>
!
<fieldset>
<dl>
<dt><label for="search_forum">{L_SEARCH_FORUMS}:</label><br /><span>{L_SEARCH_FORUMS_EXPLAIN}</span></dt>
--- 28,34 ----
<div class="inner"><span class="corners-top"><span></span></span>
<h3>{L_SEARCH_OPTIONS}</h3>
!
<fieldset>
<dl>
<dt><label for="search_forum">{L_SEARCH_FORUMS}:</label><br /><span>{L_SEARCH_FORUMS_EXPLAIN}</span></dt>
***************
*** 37,43 ****
<dl>
<dt><label for="search_child1">{L_SEARCH_SUBFORUMS}:</label></dt>
<dd>
! <label for="search_child1"><input type="radio" name="sc" id="search_child1" value="1" checked="checked" /> {L_YES}</label>
<label for="search_child2"><input type="radio" name="sc" id="search_child2" value="0" /> {L_NO}</label>
</dd>
</dl>
--- 37,43 ----
<dl>
<dt><label for="search_child1">{L_SEARCH_SUBFORUMS}:</label></dt>
<dd>
! <label for="search_child1"><input type="radio" name="sc" id="search_child1" value="1" checked="checked" /> {L_YES}</label>
<label for="search_child2"><input type="radio" name="sc" id="search_child2" value="0" /> {L_NO}</label>
</dd>
</dl>
***************
*** 54,67 ****
<dl>
<dt><label for="show_results1">{L_DISPLAY_RESULTS}:</label></dt>
<dd>
! <label for="show_results1"><input type="radio" name="sr" id="show_results1" value="posts" checked="checked" /> {L_POSTS}</label>
<label for="show_results2"><input type="radio" name="sr" id="show_results2" value="topics" /> {L_TOPICS}</label>
</dd>
</dl>
<dl>
<dt><label for="sd">{L_RESULT_SORT}:</label></dt>
<dd>{S_SELECT_SORT_KEY}
! <label for="sa"><input type="radio" name="sd" id="sa" value="a" /> {L_SORT_ASCENDING}</label>
<label for="sd"><input type="radio" name="sd" id="sd" value="d" checked="checked" /> {L_SORT_DESCENDING}</label>
</dd>
</dl>
--- 54,67 ----
<dl>
<dt><label for="show_results1">{L_DISPLAY_RESULTS}:</label></dt>
<dd>
! <label for="show_results1"><input type="radio" name="sr" id="show_results1" value="posts" checked="checked" /> {L_POSTS}</label>
<label for="show_results2"><input type="radio" name="sr" id="show_results2" value="topics" /> {L_TOPICS}</label>
</dd>
</dl>
<dl>
<dt><label for="sd">{L_RESULT_SORT}:</label></dt>
<dd>{S_SELECT_SORT_KEY}
! <label for="sa"><input type="radio" name="sd" id="sa" value="a" /> {L_SORT_ASCENDING}</label>
<label for="sd"><input type="radio" name="sd" id="sd" value="d" checked="checked" /> {L_SORT_DESCENDING}</label>
</dd>
</dl>
***************
*** 82,88 ****
<div class="inner"><span class="corners-top"><span></span></span>
<fieldset class="submit-buttons">
! {S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />
<input type="submit" name="submit" value="{L_SEARCH}" class="button1" />
</fieldset>
--- 82,88 ----
<div class="inner"><span class="corners-top"><span></span></span>
<fieldset class="submit-buttons">
! {S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />
<input type="submit" name="submit" value="{L_SEARCH}" class="button1" />
</fieldset>
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewtopic_print.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewtopic_print.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewtopic_print.html Thu Aug 20 10:31:43 2009
***************
*** 25,31 ****
<div id="page-header">
<h1>{SITENAME}</h1>
<p>{SITE_DESCRIPTION}<br /><a href="{U_FORUM}">{U_FORUM}</a></p>
!
<h2>{TOPIC_TITLE}</h2>
<p><a href="{U_TOPIC}">{U_TOPIC}</a></p>
</div>
--- 25,31 ----
<div id="page-header">
<h1>{SITENAME}</h1>
<p>{SITE_DESCRIPTION}<br /><a href="{U_FORUM}">{U_FORUM}</a></p>
!
<h2>{TOPIC_TITLE}</h2>
<p><a href="{U_TOPIC}">{U_TOPIC}</a></p>
</div>
|
|
From: Meik S. <acy...@ph...> - 2009-08-20 09:09:16
|
Author: acydburn
Date: Thu Aug 20 10:08:53 2009
New Revision: 10021
Log:
Revert r9658
Add WAI-ARIA landmarks for easier accessibility to the prosilver template (Bug #45715 - Patch by MarcoZ)
I want to test some possibilities to let these be standard-conform. At the moment no documented technique is suitable for phpBB.
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_footer.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/search_results.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/simple_footer.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/simple_header.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewforum_body.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewtopic_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 Thu Aug 20 10:08:53 2009
***************
*** 210,216 ****
<li>[Change] Hide avatar when avatar-type is not allowed (Bug #46785 - Patch by cYbercOsmOnauT and nickvergessen)</li>
<li>[Change] INCLUDEPHP not depending on phpbb_root_path (Bug #45805 - Patch by nickvergessen)</li>
<li>[Change] Ability to fetch moderators with get_moderators() even if load_moderators setting is off. (Bug #35955)</li>
- <li>[Change] Add WAI-ARIA landmarks for easier accessibility to the prosilver template (Bug #45715 - Patch by MarcoZ)</li>
<li>[Change] "Post details" links with image in MCP. (Bug #39845 - Patch by leviatan21)</li>
<li>[Change] Pm history only shows pms of the receipts you currently reply to (Bug #39505 - Patch by nickvergessen)</li>
<li>[Change] Add quote-button for own pm's in pm-history (Bug #37285 - Patch by nickvergessen)</li>
--- 210,215 ----
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_footer.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_footer.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_footer.html Thu Aug 20 10:08:53 2009
***************
*** 1,6 ****
</div>
! <div id="page-footer" role="contentinfo">
<div class="navbar">
<div class="inner"><span class="corners-top"><span></span></span>
--- 1,6 ----
</div>
! <div id="page-footer">
<div class="navbar">
<div class="inner"><span class="corners-top"><span></span></span>
***************
*** 18,24 ****
<span class="corners-bottom"><span></span></span></div>
</div>
!
<!--
We request you retain the full copyright notice below including the link to www.phpbb.com.
This not only gives respect to the large amount of time given freely by the developers
--- 18,24 ----
<span class="corners-bottom"><span></span></span></div>
</div>
!
<!--
We request you retain the full copyright notice below including the link to www.phpbb.com.
This not only gives respect to the large amount of time given freely by the developers
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html Thu Aug 20 10:08:53 2009
***************
*** 28,35 ****
phpBB style name: prosilver
Based on style: prosilver (this is the default phpBB3 style)
Original author: Tom Beddard ( http://www.subBlue.com/ )
! Modified by:
!
NOTE: This page was generated by phpBB, the free open-source bulletin board package.
The phpBB Group is not responsible for the content of this page and forum. For more information
about phpBB please visit http://www.phpbb.com
--- 28,35 ----
phpBB style name: prosilver
Based on style: prosilver (this is the default phpBB3 style)
Original author: Tom Beddard ( http://www.subBlue.com/ )
! Modified by:
!
NOTE: This page was generated by phpBB, the free open-source bulletin board package.
The phpBB Group is not responsible for the content of this page and forum. For more information
about phpBB please visit http://www.phpbb.com
***************
*** 105,111 ****
<div id="wrap">
<a id="top" name="top" accesskey="t"></a>
<div id="page-header">
! <div class="headerbar" role="banner">
<div class="inner"><span class="corners-top"><span></span></span>
<div id="site-description">
--- 105,111 ----
<div id="wrap">
<a id="top" name="top" accesskey="t"></a>
<div id="page-header">
! <div class="headerbar">
<div class="inner"><span class="corners-top"><span></span></span>
<div id="site-description">
***************
*** 116,125 ****
</div>
<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH -->
! <div id="search-box" role="search">
<form action="{U_SEARCH}" method="post" id="search">
<fieldset>
! <input name="keywords" id="keywords" type="text" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search" value="<!-- IF SEARCH_WORDS-->{SEARCH_WORDS}<!-- ELSE -->{L_SEARCH_MINI}<!-- ENDIF -->" onclick="if(this.value=='{LA_SEARCH_MINI}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_MINI}';" />
<input class="button2" value="{L_SEARCH}" type="submit" /><br />
<a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH_ADV}</a> {S_SEARCH_HIDDEN_FIELDS}
</fieldset>
--- 116,125 ----
</div>
<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH -->
! <div id="search-box">
<form action="{U_SEARCH}" method="post" id="search">
<fieldset>
! <input name="keywords" id="keywords" type="text" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search" value="<!-- IF SEARCH_WORDS-->{SEARCH_WORDS}<!-- ELSE -->{L_SEARCH_MINI}<!-- ENDIF -->" onclick="if(this.value=='{LA_SEARCH_MINI}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_MINI}';" />
<input class="button2" value="{L_SEARCH}" type="submit" /><br />
<a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH_ADV}</a> {S_SEARCH_HIDDEN_FIELDS}
</fieldset>
***************
*** 130,136 ****
<span class="corners-bottom"><span></span></span></div>
</div>
! <div class="navbar" role="navigation">
<div class="inner"><span class="corners-top"><span></span></span>
<ul class="linklist navlinks">
--- 130,136 ----
<span class="corners-bottom"><span></span></span></div>
</div>
! <div class="navbar">
<div class="inner"><span class="corners-top"><span></span></span>
<ul class="linklist navlinks">
***************
*** 148,154 ****
<ul class="linklist leftside">
<li class="icon-ucp">
<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
! <!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a>)<!-- ENDIF --> •
<a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a>
<!-- IF U_RESTORE_PERMISSIONS --> •
<a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a>
--- 148,154 ----
<ul class="linklist leftside">
<li class="icon-ucp">
<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
! <!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a>)<!-- ENDIF --> •
<a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a>
<!-- IF U_RESTORE_PERMISSIONS --> •
<a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a>
***************
*** 172,179 ****
</div>
<a name="start_here"></a>
! <div id="page-body" role="main">
! <!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN and (U_MCP or U_ACP) -->
<div id="information" class="rules">
<div class="inner"><span class="corners-top"><span></span></span>
<strong>{L_INFORMATION}:</strong> {L_BOARD_DISABLED}
--- 172,179 ----
</div>
<a name="start_here"></a>
! <div id="page-body">
! <!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN and (U_MCP or U_ACP) -->
<div id="information" class="rules">
<div class="inner"><span class="corners-top"><span></span></span>
<strong>{L_INFORMATION}:</strong> {L_BOARD_DISABLED}
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/search_results.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/search_results.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/search_results.html Thu Aug 20 10:08:53 2009
***************
*** 15,21 ****
<div class="topic-actions">
<!-- IF SEARCH_MATCHES -->
! <div class="search-box" role="search">
<!-- IF SEARCH_IN_RESULTS -->
<label for="add_keywords">{L_SEARCH_IN_RESULTS}: <input type="text" name="add_keywords" id="add_keywords" value="" class="inputbox narrow" /></label>
<input class="button2" type="submit" name="submit" value="{L_SEARCH}" />
--- 15,21 ----
<div class="topic-actions">
<!-- IF SEARCH_MATCHES -->
! <div class="search-box">
<!-- IF SEARCH_IN_RESULTS -->
<label for="add_keywords">{L_SEARCH_IN_RESULTS}: <input type="text" name="add_keywords" id="add_keywords" value="" class="inputbox narrow" /></label>
<input class="button2" type="submit" name="submit" value="{L_SEARCH}" />
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/simple_footer.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/simple_footer.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/simple_footer.html Thu Aug 20 10:08:53 2009
***************
*** 10,16 ****
The phpBB Group : 2006
//-->
! <div class="copyright" role="contentinfo">Powered by <a href="http://www.phpbb.com/">phpBB</a> © 2000, 2002, 2005, 2007 phpBB Group
<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
</div>
--- 10,16 ----
The phpBB Group : 2006
//-->
! <div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> © 2000, 2002, 2005, 2007 phpBB Group
<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
</div>
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/simple_header.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/simple_header.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/simple_header.html Thu Aug 20 10:08:53 2009
***************
*** 69,72 ****
<div id="simple-wrap">
<a id="top" name="top" accesskey="t"></a>
! <div id="page-body" role="main">
\ No newline at end of file
--- 69,72 ----
<div id="simple-wrap">
<a id="top" name="top" accesskey="t"></a>
! <div id="page-body">
\ No newline at end of file
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewforum_body.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewforum_body.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewforum_body.html Thu Aug 20 10:08:53 2009
***************
*** 44,50 ****
<!-- ENDIF -->
<!-- IF S_DISPLAY_SEARCHBOX -->
! <div class="search-box" role="search">
<form method="post" id="forum-search" action="{S_SEARCHBOX_ACTION}">
<fieldset>
<input class="inputbox search tiny" type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_FORUM}" onclick="if (this.value == '{LA_SEARCH_FORUM}') this.value = '';" onblur="if (this.value == '') this.value = '{LA_SEARCH_FORUM}';" />
--- 44,50 ----
<!-- ENDIF -->
<!-- IF S_DISPLAY_SEARCHBOX -->
! <div class="search-box">
<form method="post" id="forum-search" action="{S_SEARCHBOX_ACTION}">
<fieldset>
<input class="inputbox search tiny" type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_FORUM}" onclick="if (this.value == '{LA_SEARCH_FORUM}') this.value = '';" onblur="if (this.value == '') this.value = '{LA_SEARCH_FORUM}';" />
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewtopic_body.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewtopic_body.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewtopic_body.html Thu Aug 20 10:08:53 2009
***************
*** 37,43 ****
</div>
<!-- IF S_DISPLAY_SEARCHBOX -->
! <div class="search-box" role="search">
<form method="post" id="topic-search" action="{S_SEARCHBOX_ACTION}">
<fieldset>
<input class="inputbox search tiny" type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_TOPIC}" onclick="if(this.value=='{LA_SEARCH_TOPIC}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_TOPIC}';" />
--- 37,43 ----
</div>
<!-- IF S_DISPLAY_SEARCHBOX -->
! <div class="search-box">
<form method="post" id="topic-search" action="{S_SEARCHBOX_ACTION}">
<fieldset>
<input class="inputbox search tiny" type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_TOPIC}" onclick="if(this.value=='{LA_SEARCH_TOPIC}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_TOPIC}';" />
|
|
From: Meik S. <acy...@ph...> - 2009-08-20 08:43:29
|
Author: acydburn
Date: Thu Aug 20 09:43:10 2009
New Revision: 10020
Log:
Add some very basic checks to the users ip - related to bug #48995
Modified:
branches/phpBB-3_0_0/phpBB/includes/session.php
Modified: branches/phpBB-3_0_0/phpBB/includes/session.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/session.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/session.php Thu Aug 20 09:43:10 2009
***************
*** 268,273 ****
--- 268,294 ----
// Why no forwarded_for et al? Well, too easily spoofed. With the results of my recent requests
// it's pretty clear that in the majority of cases you'll at least be left with a proxy/cache ip.
$this->ip = (!empty($_SERVER['REMOTE_ADDR'])) ? htmlspecialchars((string) $_SERVER['REMOTE_ADDR']) : '';
+ $this->ip = preg_replace('#[ ]{2,}#', ' ', str_replace(array(',', ' '), ' ', $this->ip));
+
+ // split the list of IPs
+ $ips = explode(' ', $this->ip);
+
+ // Default IP if REMOTE_ADDR is invalid
+ $this->ip = '127.0.0.1';
+
+ foreach ($ips as $ip)
+ {
+ // check IPv4 first, the IPv6 is hopefully only going to be used very seldomly
+ if (!empty($ip) && !preg_match(get_preg_expression('ipv4'), $ip) && !preg_match(get_preg_expression('ipv6'), $ip))
+ {
+ // Just break
+ break;
+ }
+
+ // Use the last in chain
+ $this->ip = $ip;
+ }
+
$this->load = false;
// Load limit check (if applicable)
|
|
From: Meik S. <acy...@ph...> - 2009-08-20 08:37:55
|
Author: acydburn
Date: Thu Aug 20 09:37:06 2009
New Revision: 10019
Log:
Because we store forwarded_for if the check is activated we need a better check
Modified:
branches/phpBB-3_0_0/phpBB/includes/session.php
Modified: branches/phpBB-3_0_0/phpBB/includes/session.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/session.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/session.php Thu Aug 20 09:37:06 2009
***************
*** 213,219 ****
$this->update_session_page = $update_session_page;
$this->browser = (!empty($_SERVER['HTTP_USER_AGENT'])) ? htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT']) : '';
$this->referer = (!empty($_SERVER['HTTP_REFERER'])) ? htmlspecialchars((string) $_SERVER['HTTP_REFERER']) : '';
! $this->forwarded_for = (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) ? (string) $_SERVER['HTTP_X_FORWARDED_FOR'] : '';
$this->host = $this->extract_current_hostname();
$this->page = $this->extract_current_page($phpbb_root_path);
--- 213,219 ----
$this->update_session_page = $update_session_page;
$this->browser = (!empty($_SERVER['HTTP_USER_AGENT'])) ? htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT']) : '';
$this->referer = (!empty($_SERVER['HTTP_REFERER'])) ? htmlspecialchars((string) $_SERVER['HTTP_REFERER']) : '';
! $this->forwarded_for = (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) ? htmlspecialchars((string) $_SERVER['HTTP_X_FORWARDED_FOR']) : '';
$this->host = $this->extract_current_hostname();
$this->page = $this->extract_current_page($phpbb_root_path);
***************
*** 221,230 ****
// if the forwarded for header shall be checked we have to validate its contents
if ($config['forwarded_for_check'])
{
! $this->forwarded_for = preg_replace('#, +#', ', ', $this->forwarded_for);
// split the list of IPs
! $ips = explode(', ', $this->forwarded_for);
foreach ($ips as $ip)
{
// check IPv4 first, the IPv6 is hopefully only going to be used very seldomly
--- 221,230 ----
// if the forwarded for header shall be checked we have to validate its contents
if ($config['forwarded_for_check'])
{
! $this->forwarded_for = preg_replace('#[ ]{2,}#', ' ', str_replace(array(',', ' '), ' ', $this->forwarded_for));
// split the list of IPs
! $ips = explode(' ', $this->forwarded_for);
foreach ($ips as $ip)
{
// check IPv4 first, the IPv6 is hopefully only going to be used very seldomly
***************
*** 267,273 ****
// Why no forwarded_for et al? Well, too easily spoofed. With the results of my recent requests
// it's pretty clear that in the majority of cases you'll at least be left with a proxy/cache ip.
! $this->ip = (!empty($_SERVER['REMOTE_ADDR'])) ? htmlspecialchars($_SERVER['REMOTE_ADDR']) : '';
$this->load = false;
// Load limit check (if applicable)
--- 267,273 ----
// Why no forwarded_for et al? Well, too easily spoofed. With the results of my recent requests
// it's pretty clear that in the majority of cases you'll at least be left with a proxy/cache ip.
! $this->ip = (!empty($_SERVER['REMOTE_ADDR'])) ? htmlspecialchars((string) $_SERVER['REMOTE_ADDR']) : '';
$this->load = false;
// Load limit check (if applicable)
***************
*** 606,612 ****
}
else
{
! $ips = explode(', ', $this->forwarded_for);
$ips[] = $this->ip;
$this->check_ban($this->data['user_id'], $ips);
}
--- 606,612 ----
}
else
{
! $ips = explode(' ', $this->forwarded_for);
$ips[] = $this->ip;
$this->check_ban($this->data['user_id'], $ips);
}
|
|
From: Ruslan U. <rx...@ph...> - 2009-08-18 14:51:54
|
Author: rxu
Date: Tue Aug 18 15:51:08 2009
New Revision: 10018
Log:
Better tracking of global announcements
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions.php
branches/phpBB-3_0_0/phpBB/includes/functions_display.php
branches/phpBB-3_0_0/phpBB/viewtopic.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 Aug 18 15:51:08 2009
***************
*** 1730,1742 ****
$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 > ' . (int) $user->data['user_lastmark'] . '
! AND ' . $db->sql_in_set('topic_id', $tracked_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))
--- 1730,1742 ----
$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 t.topic_id
! FROM ' . TOPICS_TABLE . ' t
! WHERE t.topic_last_post_time > ' . (int) $user->data['user_lastmark'] . '
! AND ' . $db->sql_in_set('t.topic_id', $tracked_topics_list, true, true) . '
! AND ' . $db->sql_in_set('t.forum_id', $tracked_forums_list, true, true) . "
$sql_extra
! ORDER BY t.topic_last_post_time DESC";
$result = $db->sql_query_limit($sql, 1000);
while ($row = $db->sql_fetchrow($result))
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_display.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_display.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_display.php Tue Aug 18 15:51:08 2009
***************
*** 102,107 ****
--- 102,120 ----
$forum_tracking_info = array();
$branch_root_id = $root_data['forum_id'];
+
+ // Check for unread global announcements
+ // For index page only we do it
+ $ga_unread = false;
+ if ($root_data['forum_id'] == 0)
+ {
+ $unread_ga_list = get_unread_topics_list($user->data['user_id'], 'AND t.forum_id = 0');
+ if (sizeof($unread_ga_list))
+ {
+ $ga_unread = true;
+ }
+ }
+
while ($row = $db->sql_fetchrow($result))
{
$forum_id = $row['forum_id'];
***************
*** 309,314 ****
--- 322,333 ----
$forum_unread = (isset($forum_tracking_info[$forum_id]) && $row['orig_forum_last_post_time'] > $forum_tracking_info[$forum_id]) ? true : false;
+ // Mark the first visible forum on index as unread if there's any unread global announcement
+ if (($forum_id == $forum_ids_moderator[0]) && ($root_data['forum_id'] == 0) && $ga_unread)
+ {
+ $forum_unread = true;
+ }
+
$folder_image = $folder_alt = $l_subforums = '';
$subforums_list = array();
Modified: branches/phpBB-3_0_0/phpBB/viewtopic.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/viewtopic.php (original)
--- branches/phpBB-3_0_0/phpBB/viewtopic.php Tue Aug 18 15:51:08 2009
***************
*** 1593,1598 ****
--- 1593,1619 ----
}
}
+ // Get last post time for all global announcements
+ // to keep proper forums tracking
+ if ($topic_data['topic_type'] == POST_GLOBAL)
+ {
+ $sql = 'SELECT topic_last_post_time as forum_last_post_time
+ FROM ' . TOPICS_TABLE . '
+ WHERE forum_id = 0
+ ORDER BY topic_last_post_time DESC';
+ $result = $db->sql_query_limit($sql, 1);
+ $topic_data['forum_last_post_time'] = (int) $db->sql_fetchfield('forum_last_post_time');
+ $db->sql_freeresult($result);
+
+ $sql = 'SELECT mark_time as forum_mark_time
+ FROM ' . FORUMS_TRACK_TABLE . '
+ WHERE forum_id = 0
+ AND user_id = ' . $user->data['user_id'];
+ $result = $db->sql_query($sql);
+ $topic_data['forum_mark_time'] = (int) $db->sql_fetchfield('forum_mark_time');
+ $db->sql_freeresult($result);
+ }
+
// Only mark topic if it's currently unread. Also make sure we do not set topic tracking back if earlier pages are viewed.
if (isset($topic_tracking_info[$topic_id]) && $topic_data['topic_last_post_time'] > $topic_tracking_info[$topic_id] && $max_post_time > $topic_tracking_info[$topic_id])
{
|
|
From: Andreas F. <ba...@ph...> - 2009-08-18 14:38:36
|
Author: bantu
Date: Tue Aug 18 15:37:49 2009
New Revision: 10017
Log:
Adjustment to r9887: Only use one language variable.
Modified:
branches/phpBB-3_0_0/phpBB/includes/acp/acp_permissions.php
branches/phpBB-3_0_0/phpBB/language/en/acp/permissions.php
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_permissions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_permissions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_permissions.php Tue Aug 18 15:37:49 2009
***************
*** 1209,1215 ****
$s_hidden_fields = build_hidden_fields($s_hidden_fields);
! confirm_box(false, $user->lang['CONFIRM_OPERATION'] . ' ' . $user->lang['COPY_PERMISSIONS_CONFIRM'], $s_hidden_fields);
}
}
--- 1209,1215 ----
$s_hidden_fields = build_hidden_fields($s_hidden_fields);
! confirm_box(false, $user->lang['COPY_PERMISSIONS_CONFIRM'], $s_hidden_fields);
}
}
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/permissions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/permissions.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/permissions.php Tue Aug 18 15:37:49 2009
***************
*** 110,116 ****
'APPLY_PERMISSIONS_EXPLAIN' => 'The permissions and role defined for this item will only be applied to this item and all checked items.',
'AUTH_UPDATED' => 'Permissions have been updated.',
! 'COPY_PERMISSIONS_CONFIRM' => 'Please be aware that this will overwrite any existing permissions on the selected targets.',
'COPY_PERMISSIONS_FORUM_FROM_EXPLAIN' => 'The source forum you want to copy permissions from.',
'COPY_PERMISSIONS_FORUM_TO_EXPLAIN' => 'The destination forums you want the copied permissions applied to.',
'COPY_PERMISSIONS_FROM' => 'Copy permissions from',
--- 110,116 ----
'APPLY_PERMISSIONS_EXPLAIN' => 'The permissions and role defined for this item will only be applied to this item and all checked items.',
'AUTH_UPDATED' => 'Permissions have been updated.',
! 'COPY_PERMISSIONS_CONFIRM' => 'Are you sure you wish to carry out this operation? Please be aware that this will overwrite any existing permissions on the selected targets.',
'COPY_PERMISSIONS_FORUM_FROM_EXPLAIN' => 'The source forum you want to copy permissions from.',
'COPY_PERMISSIONS_FORUM_TO_EXPLAIN' => 'The destination forums you want the copied permissions applied to.',
'COPY_PERMISSIONS_FROM' => 'Copy permissions from',
|
|
From: Joas S. <nic...@ph...> - 2009-08-18 14:04:33
|
Author: nickvergessen
Date: Tue Aug 18 15:03:43 2009
New Revision: 10016
Log:
Fix Bug #49945 - Correctly orientate Control-Panel-Navigation background-image on RTL languages.
Authorised by: AcydBurn
Added:
branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/images/bg_menu_rtl.gif (with props)
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/colours.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 Tue Aug 18 15:03:43 2009
***************
*** 197,202 ****
--- 197,203 ----
<li>[Fix] Correctly redirect on MCP main page after posts approval/disapproval from it. (Bug #49625)</li>
<li>[Fix] Do not display topic approval status image for shadow topic if a user is not a moderator in the forum the topic has been moved to. (Bug #43295)</li>
<li>[Fix] Fix email problems on servers with PHP installations not accepting RFC-compliant subject string passed to the the mail()-function. (Bug #46725)</li>
+ <li>[Fix] Correctly orientate Control-Panel-Navigation background-image on RTL languages. (Bug #49945)</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/colours.css
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/colours.css (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/colours.css Tue Aug 18 15:03:43 2009
***************
*** 790,795 ****
--- 790,800 ----
background-image: url("{T_THEME_PATH}/images/bg_menu.gif");
}
+ .rtl #navigation a {
+ background-image: url("{T_THEME_PATH}/images/bg_menu_rtl.gif");
+ background-position: 0 100%;
+ }
+
#navigation a:hover {
background-color: #aabac6;
color: #BC2A4D;
Added: branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/images/bg_menu_rtl.gif
==============================================================================
Binary file - no diff available.
Propchange: branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/images/bg_menu_rtl.gif
------------------------------------------------------------------------------
svn:mime-type = image/gif
|
|
From: Meik S. <acy...@ph...> - 2009-08-18 13:25:02
|
Author: acydburn
Date: Tue Aug 18 14:24:45 2009
New Revision: 10015
Log:
we will use the non-compliant way for mail() until we further inspected PHP's source.
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php Tue Aug 18 14:24:45 2009
***************
*** 1526,1544 ****
$headers = implode($eol, $headers);
ob_start();
- $result = $config['email_function_name']($to, mail_encode($subject, $eol), wordwrap(utf8_wordwrap($msg), 997, "\n", true), $headers);
- $err_msg = ob_get_clean();
-
- // Try again...
// On some PHP Versions mail() *may* fail if there are newlines within the subject.
// Newlines are used as a delimiter for lines in mail_encode() according to RFC 2045 section 6.8.
! if (!$result)
! {
! // Use nothing as delimiter (results in SPACE used)
! ob_start();
! $result = $config['email_function_name']($to, mail_encode($subject, ''), wordwrap(utf8_wordwrap($msg), 997, "\n", true), $headers);
! $err_msg = ob_get_clean();
! }
return $result;
}
--- 1526,1536 ----
$headers = implode($eol, $headers);
ob_start();
// On some PHP Versions mail() *may* fail if there are newlines within the subject.
// Newlines are used as a delimiter for lines in mail_encode() according to RFC 2045 section 6.8.
! // Because PHP can't decide what is wanted we revert back to the non-RFC-compliant way of separating by one space (Use '' as parameter to mail_encode() results in SPACE used)
! $result = $config['email_function_name']($to, mail_encode($subject, ''), wordwrap(utf8_wordwrap($msg), 997, "\n", true), $headers);
! $err_msg = ob_get_clean();
return $result;
}
|
|
From: Meik S. <acy...@ph...> - 2009-08-18 10:00:11
|
Author: acydburn
Date: Tue Aug 18 10:59:24 2009
New Revision: 10014
Log:
Fix email problems on servers with PHP installations not accepting RFC-compliant subject string passed to the the mail()-function. (Bug #46725)
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/functions_messenger.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 Tue Aug 18 10:59:24 2009
***************
*** 196,201 ****
--- 196,202 ----
<li>[Fix] Prevent style switcher from blocking the tab key. (Bug #49335)</li>
<li>[Fix] Correctly redirect on MCP main page after posts approval/disapproval from it. (Bug #49625)</li>
<li>[Fix] Do not display topic approval status image for shadow topic if a user is not a moderator in the forum the topic has been moved to. (Bug #43295)</li>
+ <li>[Fix] Fix email problems on servers with PHP installations not accepting RFC-compliant subject string passed to the the mail()-function. (Bug #46725)</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/functions_messenger.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php Tue Aug 18 10:59:24 2009
***************
*** 390,396 ****
$headers[] = 'X-Priority: ' . $this->mail_priority;
$headers[] = 'X-MSMail-Priority: ' . (($this->mail_priority == MAIL_LOW_PRIORITY) ? 'Low' : (($this->mail_priority == MAIL_NORMAL_PRIORITY) ? 'Normal' : 'High'));
! $headers[] = 'X-Mailer: PhpBB3';
$headers[] = 'X-MimeOLE: phpBB3';
$headers[] = 'X-phpBB-Origin: phpbb://' . str_replace(array('http://', 'https://'), array('', ''), generate_board_url());
--- 390,396 ----
$headers[] = 'X-Priority: ' . $this->mail_priority;
$headers[] = 'X-MSMail-Priority: ' . (($this->mail_priority == MAIL_LOW_PRIORITY) ? 'Low' : (($this->mail_priority == MAIL_NORMAL_PRIORITY) ? 'Normal' : 'High'));
! $headers[] = 'X-Mailer: phpBB3';
$headers[] = 'X-MimeOLE: phpBB3';
$headers[] = 'X-phpBB-Origin: phpbb://' . str_replace(array('http://', 'https://'), array('', ''), generate_board_url());
***************
*** 474,486 ****
}
else
{
! // We use the EOL character for the OS here because the PHP mail function does not correctly transform line endings. On Windows SMTP is used (SMTP is \r\n), on UNIX a command is used...
! // Reference: http://bugs.php.net/bug.php?id=15841
! $headers = implode($this->eol, $headers);
!
! ob_start();
! $result = $config['email_function_name']($mail_to, mail_encode($this->subject, $this->eol), wordwrap(utf8_wordwrap($this->msg), 997, "\n", true), $headers);
! $err_msg = ob_get_clean();
}
if (!$result)
--- 474,480 ----
}
else
{
! $result = phpbb_mail($mail_to, $this->subject, $this->msg, $headers, $this->eol, $err_msg);
}
if (!$result)
***************
*** 723,731 ****
}
else
{
! ob_start();
! $result = $config['email_function_name']($to, mail_encode($subject, $this->eol), wordwrap(utf8_wordwrap($msg), 997, "\n", true), implode($this->eol, $headers));
! $err_msg = ob_get_clean();
}
if (!$result)
--- 717,723 ----
}
else
{
! $result = phpbb_mail($to, $subject, $msg, $headers, $this->eol, $err_msg);
}
if (!$result)
***************
*** 1522,1525 ****
--- 1514,1546 ----
return substr($str, 0, -strlen($delimiter));
}
+ /**
+ * Wrapper for sending out emails with the PHP's mail function
+ */
+ function phpbb_mail($to, $subject, $msg, $headers, $eol, &$err_msg)
+ {
+ global $config;
+
+ // We use the EOL character for the OS here because the PHP mail function does not correctly transform line endings. On Windows SMTP is used (SMTP is \r\n), on UNIX a command is used...
+ // Reference: http://bugs.php.net/bug.php?id=15841
+ $headers = implode($eol, $headers);
+
+ ob_start();
+ $result = $config['email_function_name']($to, mail_encode($subject, $eol), wordwrap(utf8_wordwrap($msg), 997, "\n", true), $headers);
+ $err_msg = ob_get_clean();
+
+ // Try again...
+ // On some PHP Versions mail() *may* fail if there are newlines within the subject.
+ // Newlines are used as a delimiter for lines in mail_encode() according to RFC 2045 section 6.8.
+ if (!$result)
+ {
+ // Use nothing as delimiter (results in SPACE used)
+ ob_start();
+ $result = $config['email_function_name']($to, mail_encode($subject, ''), wordwrap(utf8_wordwrap($msg), 997, "\n", true), $headers);
+ $err_msg = ob_get_clean();
+ }
+
+ return $result;
+ }
+
?>
\ No newline at end of file
|
|
From: Andreas F. <ba...@ph...> - 2009-08-18 08:22:28
|
Author: bantu
Date: Tue Aug 18 09:22:17 2009
New Revision: 10013
Log:
Tiny typo change to r9743, #46425.
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 Tue Aug 18 09:22:17 2009
***************
*** 13,19 ****
// Enter any version to update from to test updates. The version within the db will not be updated.
$debug_from_version = '3.0.5';
! // Which oldest version does this updater supports?
$oldest_from_version = '3.0.0';
// Return if we "just include it" to find out for which version the database update is responsible for
--- 13,19 ----
// Enter any version to update from to test updates. The version within the db will not be updated.
$debug_from_version = '3.0.5';
! // Which oldest version does this updater support?
$oldest_from_version = '3.0.0';
// Return if we "just include it" to find out for which version the database update is responsible for
|
|
From: Chris S. <too...@ph...> - 2009-08-18 01:52:28
|
Author: toonarmy
Date: Tue Aug 18 02:43:51 2009
New Revision: 10011
Log:
Per RFC2047 section 5 do not use quoted strings for encoded recipient names
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php Tue Aug 18 02:43:51 2009
***************
*** 455,461 ****
foreach ($address_ary as $which_ary)
{
! $$type .= (($$type != '') ? ', ' : '') . (($which_ary['name'] != '') ? '"' . mail_encode($which_ary['name'], $encode_eol) . '" <' . $which_ary['email'] . '>' : $which_ary['email']);
}
}
--- 455,461 ----
foreach ($address_ary as $which_ary)
{
! $$type .= (($$type != '') ? ', ' : '') . (($which_ary['name'] != '') ? mail_encode($which_ary['name'], $encode_eol) . ' <' . $which_ary['email'] . '>' : $which_ary['email']);
}
}
|
|
From: Chris S. <too...@ph...> - 2009-08-18 01:52:25
|
Author: toonarmy
Date: Tue Aug 18 02:45:31 2009
New Revision: 10012
Log:
A little precaution
Modified:
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php Tue Aug 18 02:45:31 2009
***************
*** 895,901 ****
{
// Load up the language pack
$lang = array();
! @include($phpbb_root_path . '/language/' . $post_data['user_lang'] . '/mcp.' . $phpEx);
// If we find the reason in this language pack use it
if (isset($lang['report_reasons']['DESCRIPTION'][$disapprove_reason_lang]))
--- 895,901 ----
{
// Load up the language pack
$lang = array();
! @include($phpbb_root_path . '/language/' . basename($post_data['user_lang']) . '/mcp.' . $phpEx);
// If we find the reason in this language pack use it
if (isset($lang['report_reasons']['DESCRIPTION'][$disapprove_reason_lang]))
|
|
From: Meik S. <acy...@ph...> - 2009-08-17 15:47:53
|
Author: acydburn
Date: Mon Aug 17 16:47:07 2009
New Revision: 10010
Log:
i know, i know, no need to hrm me. :P - r10009
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 Mon Aug 17 16:47:07 2009
***************
*** 4091,4097 ****
// Determine board url - we may need it later
$board_url = generate_board_url() . '/';
! $web_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url . '/' : $phpbb_root_path;
// The following assigns all _common_ variables that may be used at any point in a template.
$template->assign_vars(array(
--- 4091,4097 ----
// Determine board url - we may need it later
$board_url = generate_board_url() . '/';
! $web_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url : $phpbb_root_path;
// The following assigns all _common_ variables that may be used at any point in a template.
$template->assign_vars(array(
|
|
From: Meik S. <acy...@ph...> - 2009-08-17 15:45:20
|
Author: acydburn
Date: Mon Aug 17 16:45:07 2009
New Revision: 10009
Log:
no need to call generate_board_url() twice - r10008
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 Mon Aug 17 16:45:07 2009
***************
*** 1796,1802 ****
}
else
{
! $unread_topics_list[$topic_id] = $user_lastmark;
}
}
--- 1796,1802 ----
}
else
{
! $unread_topics_list[$topic_id] = $user_lastmark;
}
}
***************
*** 4091,4097 ****
// Determine board url - we may need it later
$board_url = generate_board_url() . '/';
! $web_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_root_path;
// The following assigns all _common_ variables that may be used at any point in a template.
$template->assign_vars(array(
--- 4091,4097 ----
// Determine board url - we may need it later
$board_url = generate_board_url() . '/';
! $web_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url . '/' : $phpbb_root_path;
// The following assigns all _common_ variables that may be used at any point in a template.
$template->assign_vars(array(
|
|
From: Meik S. <acy...@ph...> - 2009-08-17 14:46:00
|
Author: acydburn
Date: Mon Aug 17 15:45:14 2009
New Revision: 10008
Log:
Ability to define constant PHPBB_USE_BOARD_URL_PATH to use board url for images/avatars/ranks/imageset...
This feature does not change anything for those not using the constant and this feature is also quite in-flux. We need to test this with some applications and bridges and there may be other locations able to benefit from it.
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/functions.php
branches/phpBB-3_0_0/phpBB/includes/functions_content.php
branches/phpBB-3_0_0/phpBB/includes/functions_posting.php
branches/phpBB-3_0_0/phpBB/includes/session.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 Mon Aug 17 15:45:14 2009
***************
*** 278,284 ****
<li>[Feature] Fallback options for missing language files. (Bug #38575 - Patch by EXreaction)</li>
<li>[Feature] Separate PM Reply and PM Reply to all in prosilver.</li>
<li>[Feature] Place debug notices during captcha rendering in the error log - useful for debugging output already started errors.</li>
!
</ul>
<a name="v304"></a><h3>1.ii. Changes since 3.0.4</h3>
--- 278,284 ----
<li>[Feature] Fallback options for missing language files. (Bug #38575 - Patch by EXreaction)</li>
<li>[Feature] Separate PM Reply and PM Reply to all in prosilver.</li>
<li>[Feature] Place debug notices during captcha rendering in the error log - useful for debugging output already started errors.</li>
! <li>[Feature] Ability to define constant PHPBB_USE_BOARD_URL_PATH to use board url for images/avatars/ranks/imageset...</li>
</ul>
<a name="v304"></a><h3>1.ii. Changes since 3.0.4</h3>
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 Aug 17 15:45:14 2009
***************
*** 4089,4094 ****
--- 4089,4098 ----
$db->sql_freeresult($result);
}
+ // Determine board url - we may need it later
+ $board_url = generate_board_url() . '/';
+ $web_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_root_path;
+
// The following assigns all _common_ variables that may be used at any point in a template.
$template->assign_vars(array(
'SITENAME' => $config['sitename'],
***************
*** 4112,4117 ****
--- 4116,4122 ----
'_SID' => $_SID,
'SESSION_ID' => $user->session_id,
'ROOT_PATH' => $phpbb_root_path,
+ 'BOARD_URL' => $board_url,
'L_LOGIN_LOGOUT' => $l_login_logout,
'L_INDEX' => $user->lang['FORUM_INDEX'],
***************
*** 4170,4190 ****
'S_ENABLE_FEEDS_TOPICS' => ($config['feed_overall_topics']) ? true : false,
'S_ENABLE_FEEDS_NEWS' => ($s_feed_news) ? true : false,
! 'T_THEME_PATH' => "{$phpbb_root_path}styles/" . $user->theme['theme_path'] . '/theme',
! 'T_TEMPLATE_PATH' => "{$phpbb_root_path}styles/" . $user->theme['template_path'] . '/template',
! 'T_SUPER_TEMPLATE_PATH' => (isset($user->theme['template_inherit_path']) && $user->theme['template_inherit_path']) ? "{$phpbb_root_path}styles/" . $user->theme['template_inherit_path'] . '/template' : "{$phpbb_root_path}styles/" . $user->theme['template_path'] . '/template',
! 'T_IMAGESET_PATH' => "{$phpbb_root_path}styles/" . $user->theme['imageset_path'] . '/imageset',
! 'T_IMAGESET_LANG_PATH' => "{$phpbb_root_path}styles/" . $user->theme['imageset_path'] . '/imageset/' . $user->data['user_lang'],
! 'T_IMAGES_PATH' => "{$phpbb_root_path}images/",
! 'T_SMILIES_PATH' => "{$phpbb_root_path}{$config['smilies_path']}/",
! 'T_AVATAR_PATH' => "{$phpbb_root_path}{$config['avatar_path']}/",
! 'T_AVATAR_GALLERY_PATH' => "{$phpbb_root_path}{$config['avatar_gallery_path']}/",
! 'T_ICONS_PATH' => "{$phpbb_root_path}{$config['icons_path']}/",
! 'T_RANKS_PATH' => "{$phpbb_root_path}{$config['ranks_path']}/",
! 'T_UPLOAD_PATH' => "{$phpbb_root_path}{$config['upload_path']}/",
! 'T_STYLESHEET_LINK' => (!$user->theme['theme_storedb']) ? "{$phpbb_root_path}styles/" . $user->theme['theme_path'] . '/theme/stylesheet.css' : "{$phpbb_root_path}style.$phpEx?sid=$user->session_id&id=" . $user->theme['style_id'] . '&lang=' . $user->data['user_lang'],
'T_STYLESHEET_NAME' => $user->theme['theme_name'],
'SITE_LOGO_IMG' => $user->img('site_logo'),
'A_COOKIE_SETTINGS' => addslashes('; path=' . $config['cookie_path'] . ((!$config['cookie_domain'] || $config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1') ? '' : '; domain=' . $config['cookie_domain']) . ((!$config['cookie_secure']) ? '' : '; secure')),
--- 4175,4208 ----
'S_ENABLE_FEEDS_TOPICS' => ($config['feed_overall_topics']) ? true : false,
'S_ENABLE_FEEDS_NEWS' => ($s_feed_news) ? true : false,
! 'T_THEME_PATH' => "{$web_path}styles/" . $user->theme['theme_path'] . '/theme',
! 'T_TEMPLATE_PATH' => "{$web_path}styles/" . $user->theme['template_path'] . '/template',
! 'T_SUPER_TEMPLATE_PATH' => (isset($user->theme['template_inherit_path']) && $user->theme['template_inherit_path']) ? "{$web_path}styles/" . $user->theme['template_inherit_path'] . '/template' : "{$web_path}styles/" . $user->theme['template_path'] . '/template',
! 'T_IMAGESET_PATH' => "{$web_path}styles/" . $user->theme['imageset_path'] . '/imageset',
! 'T_IMAGESET_LANG_PATH' => "{$web_path}styles/" . $user->theme['imageset_path'] . '/imageset/' . $user->data['user_lang'],
! 'T_IMAGES_PATH' => "{$web_path}images/",
! 'T_SMILIES_PATH' => "{$web_path}{$config['smilies_path']}/",
! 'T_AVATAR_PATH' => "{$web_path}{$config['avatar_path']}/",
! 'T_AVATAR_GALLERY_PATH' => "{$web_path}{$config['avatar_gallery_path']}/",
! 'T_ICONS_PATH' => "{$web_path}{$config['icons_path']}/",
! 'T_RANKS_PATH' => "{$web_path}{$config['ranks_path']}/",
! 'T_UPLOAD_PATH' => "{$web_path}{$config['upload_path']}/",
! 'T_STYLESHEET_LINK' => (!$user->theme['theme_storedb']) ? "{$web_path}styles/" . $user->theme['theme_path'] . '/theme/stylesheet.css' : append_sid("{$phpbb_root_path}style.$phpEx", 'id=' . $user->theme['style_id'] . '&lang=' . $user->data['user_lang']),
'T_STYLESHEET_NAME' => $user->theme['theme_name'],
+ 'T_THEME_NAME' => $user->theme['theme_path'],
+ 'T_TEMPLATE_NAME' => $user->theme['template_path'],
+ 'T_SUPER_TEMPLATE_NAME' => (isset($user->theme['template_inherit_path']) && $user->theme['template_inherit_path']) ? $user->theme['template_inherit_path'] : $user->theme['template_path'],
+ 'T_IMAGESET_NAME' => $user->theme['imageset_path'],
+ 'T_IMAGESET_LANG_NAME' => $user->data['user_lang'],
+ 'T_IMAGES' => 'images',
+ 'T_SMILIES' => $config['smilies_path'],
+ 'T_AVATAR' => $config['avatar_path'],
+ 'T_AVATAR_GALLERY' => $config['avatar_gallery_path'],
+ 'T_ICONS' => $config['icons_path'],
+ 'T_RANKS' => $config['ranks_path'],
+ 'T_UPLOAD' => $config['upload_path'],
+
'SITE_LOGO_IMG' => $user->img('site_logo'),
'A_COOKIE_SETTINGS' => addslashes('; path=' . $config['cookie_path'] . ((!$config['cookie_domain'] || $config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1') ? '' : '; domain=' . $config['cookie_domain']) . ((!$config['cookie_secure']) ? '' : '; secure')),
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_content.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_content.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_content.php Mon Aug 17 15:45:14 2009
***************
*** 733,739 ****
}
else
{
! return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img src="' . $phpbb_root_path . $config['smilies_path'] . '/\2 />', $text);
}
}
--- 733,740 ----
}
else
{
! $root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_root_path;
! return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img src="' . $root_path . $config['smilies_path'] . '/\2 />', $text);
}
}
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_posting.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_posting.php Mon Aug 17 15:45:14 2009
***************
*** 112,123 ****
if (sizeof($smilies))
{
foreach ($smilies as $row)
{
$template->assign_block_vars('smiley', array(
'SMILEY_CODE' => $row['code'],
'A_SMILEY_CODE' => addslashes($row['code']),
! 'SMILEY_IMG' => $phpbb_root_path . $config['smilies_path'] . '/' . $row['smiley_url'],
'SMILEY_WIDTH' => $row['smiley_width'],
'SMILEY_HEIGHT' => $row['smiley_height'],
'SMILEY_DESC' => $row['emotion'])
--- 112,125 ----
if (sizeof($smilies))
{
+ $root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_root_path;
+
foreach ($smilies as $row)
{
$template->assign_block_vars('smiley', array(
'SMILEY_CODE' => $row['code'],
'A_SMILEY_CODE' => addslashes($row['code']),
! 'SMILEY_IMG' => $root_path . $config['smilies_path'] . '/' . $row['smiley_url'],
'SMILEY_WIDTH' => $row['smiley_width'],
'SMILEY_HEIGHT' => $row['smiley_height'],
'SMILEY_DESC' => $row['emotion'])
Modified: branches/phpBB-3_0_0/phpBB/includes/session.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/session.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/session.php Mon Aug 17 15:45:14 2009
***************
*** 2196,2202 ****
return $img_data;
}
! $img_data['src'] = $phpbb_root_path . 'styles/' . rawurlencode($this->theme['imageset_path']) . '/imageset/' . ($this->img_array[$img]['image_lang'] ? $this->img_array[$img]['image_lang'] .'/' : '') . $this->img_array[$img]['image_filename'];
$img_data['width'] = $this->img_array[$img]['image_width'];
$img_data['height'] = $this->img_array[$img]['image_height'];
}
--- 2196,2205 ----
return $img_data;
}
! // Use URL if told so
! $root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_root_path;
!
! $img_data['src'] = $root_path . 'styles/' . rawurlencode($this->theme['imageset_path']) . '/imageset/' . ($this->img_array[$img]['image_lang'] ? $this->img_array[$img]['image_lang'] .'/' : '') . $this->img_array[$img]['image_filename'];
$img_data['width'] = $this->img_array[$img]['image_width'];
$img_data['height'] = $this->img_array[$img]['image_height'];
}
|
|
From: Meik S. <acy...@ph...> - 2009-08-17 14:42:38
|
Author: acydburn
Date: Mon Aug 17 15:42:27 2009
New Revision: 10007
Log:
Added section about special constants able to be used.
Modified:
branches/phpBB-3_0_0/phpBB/docs/coding-guidelines.html
branches/phpBB-3_0_0/phpBB/docs/hook_system.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 Mon Aug 17 15:42:27 2009
***************
*** 57,62 ****
--- 57,63 ----
<li><a href="#editorsettings">Editor Settings</a></li>
<li><a href="#fileheader">File Header</a></li>
<li><a href="#locations">File Locations</a></li>
+ <li><a href="#constants">Special Constants</a></li>
</ol>
</li>
<li><a href="#code">Code Layout/Guidelines</a>
***************
*** 223,228 ****
--- 224,277 ----
<li><strong>styles</strong><br /><code>/styles</code>, <code>style.php</code><br />phpBB Styles/Templates/Themes/Imagesets</li>
</ul>
+ <a name="constants"></a></h3>1.iv. Special Constants</h3>
+
+ <p>There are some special constants application developers are able to utilize to bend some of phpBB's internal functionality to suit their needs.</p>
+
+ <div class="codebox"><pre>
+ PHPBB_MSG_HANDLER (overwrite message handler)
+ PHPBB_DB_NEW_LINK (overwrite new_link parameter for sql_connect)
+ PHPBB_ROOT_PATH (overwrite $phpbb_root_path)
+ PHPBB_ADMIN_PATH (overwrite $phpbb_admin_path)
+ PHPBB_USE_BOARD_URL_PATH (use generate_board_url() for image paths instead of $phpbb_root_path)
+ PHPBB_DISABLE_ACP_EDITOR (disable ACP style editor for templates)
+ PHPBB_DISABLE_CONFIG_CHECK (disable ACP config.php writeable check)
+
+ PHPBB_ACM_MEMCACHE_PORT (overwrite memcached port, default is 11211)
+ PHPBB_ACM_MEMCACHE_COMPRESS (overwrite memcached compress setting, default is disabled)
+ PHPBB_ACM_MEMCACHE_HOST (overwrite memcached host name, default is localhost)
+
+ PHPBB_QA (Set board to QA-Mode, which means the updater also checks for RC-releases)
+ </pre></div>
+
+ <h4>PHPBB_USE_BOARD_URL_PATH</h4>
+
+ <p>If the <code>PHPBB_USE_BOARD_URL_PATH</code> constant is set to true, phpBB uses generate_board_url() (this will return the boards url with the script path included) on all instances where web-accessible images are loaded. The exact locations are:</p>
+
+ <ul>
+ <li>/includes/session.php - user::img()</li>
+ <li>/includes/functions_content.php - smiley_text()</li>
+ </ul>
+
+ <p>Path locations for the following template variables are affected by this too:</p>
+
+ <ul>
+ <li>{T_THEME_PATH} - styles/xxx/theme</li>
+ <li>{T_TEMPLATE_PATH} - styles/xxx/template</li>
+ <li>{T_SUPER_TEMPLATE_PATH} - styles/xxx/template</li>
+ <li>{T_IMAGESET_PATH} - styles/xxx/imageset</li>
+ <li>{T_IMAGESET_LANG_PATH} - styles/xxx/imageset/yy</li>
+ <li>{T_IMAGES_PATH} - images/</li>
+ <li>{T_SMILIES_PATH} - $config['smilies_path']/</li>
+ <li>{T_AVATAR_PATH} - $config['avatar_path']/</li>
+ <li>{T_AVATAR_GALLERY_PATH} - $config['avatar_gallery_path']/</li>
+ <li>{T_ICONS_PATH} - $config['icons_path']/</li>
+ <li>{T_RANKS_PATH} - $config['ranks_path']/</li>
+ <li>{T_UPLOAD_PATH} - $config['upload_path']/</li>
+ <li>{T_STYLESHEET_LINK} - styles/xxx/theme/stylesheet.css (or link to style.php if css is parsed dynamically)</li>
+ <li>New template variable {BOARD_URL} for the board url + script path.</li>
+ </ul>
+
</div>
<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
***************
*** 1123,1129 ****
<p>Template defined variables can also be utilised.
<div class="codebox"><pre>
<span class="comment"><!-- DEFINE $SOME_VAR = 'my_file.html' --></span>
! <span class="comment"><!-- INCLUDE {$SOME_VAR} --></span>
</pre></div>
<h4>PHP</h4>
--- 1172,1178 ----
<p>Template defined variables can also be utilised.
<div class="codebox"><pre>
<span class="comment"><!-- DEFINE $SOME_VAR = 'my_file.html' --></span>
! <span class="comment"><!-- INCLUDE {$SOME_VAR} --></span>
</pre></div>
<h4>PHP</h4>
***************
*** 2297,2309 ****
</ul>
</li>
</ul>
!
<a name="commitmessage"></a><h3>7.ii. Commit Messages</h3>
<p>The commit message should contain a brief explanation of all changes made within the commit. Often identical to the changelog entry. A bug ticket can be referenced by specifying the ticket ID with a hash, e.g. #12345. A reference to another revision should simply be prefixed with r, e.g. r12345.</p>
<p>Junior Developers need to have their patches approved by a development team member first. The commit message must end in a line with the following format:</p>
!
<div class="codebox"><pre>
Authorised by: developer1[, developer2[, ...]]
</pre></div>
--- 2346,2358 ----
</ul>
</li>
</ul>
!
<a name="commitmessage"></a><h3>7.ii. Commit Messages</h3>
<p>The commit message should contain a brief explanation of all changes made within the commit. Often identical to the changelog entry. A bug ticket can be referenced by specifying the ticket ID with a hash, e.g. #12345. A reference to another revision should simply be prefixed with r, e.g. r12345.</p>
<p>Junior Developers need to have their patches approved by a development team member first. The commit message must end in a line with the following format:</p>
!
<div class="codebox"><pre>
Authorised by: developer1[, developer2[, ...]]
</pre></div>
***************
*** 2322,2328 ****
--- 2371,2381 ----
<div class="inner"><span class="corners-top"><span></span></span>
<div class="content">
+ <h3>Revision 10007</h3>
+ <ul>
+ <li>Added <a href="#constants">Special Constants</a> section.</li>
+ </ul>
<h3>Revision 9817</h3>
Modified: branches/phpBB-3_0_0/phpBB/docs/hook_system.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/hook_system.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/hook_system.html Mon Aug 17 15:42:27 2009
***************
*** 104,117 ****
border-top: 1px solid #ccc;
}
! code {
! color: #006600;
! font-weight: normal;
! font-family: 'Courier New', monospace;
! border-color: #D1D7DC;
! border-width: 1px;
! border-style: solid;
! background-color: #FAFAFA;
}
#wrap {
--- 104,117 ----
border-top: 1px solid #ccc;
}
! code {
! color: #006600;
! font-weight: normal;
! font-family: 'Courier New', monospace;
! border-color: #D1D7DC;
! border-width: 1px;
! border-style: solid;
! background-color: #FAFAFA;
}
#wrap {
***************
*** 387,394 ****
--- 387,422 ----
PHPBB_DB_NEW_LINK (overwrite new_link parameter for sql_connect)
PHPBB_ROOT_PATH (overwrite $phpbb_root_path)
PHPBB_ADMIN_PATH (overwrite $phpbb_admin_path)
+ PHPBB_USE_BOARD_URL_PATH (use generate_board_url() for image paths instead of $phpbb_root_path)
</pre></div>
+ <p>If the <code>PHPBB_USE_BOARD_URL_PATH</code> constant is set to true, phpBB uses generate_board_url() (this will return the boards url with the script path included) on all instances where web-accessible images are loaded. The exact locations are:</p>
+
+ <ul>
+ <li>/includes/session.php - user::img()</li>
+ <li>/includes/functions_content.php - smiley_text()</li>
+ </ul>
+
+ <p>Path locations for the following template variables are affected by this too:</p>
+
+ <ul>
+ <li>{T_THEME_PATH} - styles/xxx/theme</li>
+ <li>{T_TEMPLATE_PATH} - styles/xxx/template</li>
+ <li>{T_SUPER_TEMPLATE_PATH} - styles/xxx/template</li>
+ <li>{T_IMAGESET_PATH} - styles/xxx/imageset</li>
+ <li>{T_IMAGESET_LANG_PATH} - styles/xxx/imageset/yy</li>
+ <li>{T_IMAGES_PATH} - images/</li>
+ <li>{T_SMILIES_PATH} - $config['smilies_path']/</li>
+ <li>{T_AVATAR_PATH} - $config['avatar_path']/</li>
+ <li>{T_AVATAR_GALLERY_PATH} - $config['avatar_gallery_path']/</li>
+ <li>{T_ICONS_PATH} - $config['icons_path']/</li>
+ <li>{T_RANKS_PATH} - $config['ranks_path']/</li>
+ <li>{T_UPLOAD_PATH} - $config['upload_path']/</li>
+ <li>{T_STYLESHEET_LINK} - styles/xxx/theme/stylesheet.css (or link to style.php if css is parsed dynamically)</li>
+ <li>New template variable {BOARD_URL} for the board url + script path.</li>
+ </ul>
+
+
</div>
<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
***************
*** 616,622 ****
<div class="codebox"><pre>
not hooked
! hooked
</pre></div>
<p>A different possibility would be using a function variable (which could be left out on passing the function variables to the hook):</p>
--- 644,650 ----
<div class="codebox"><pre>
not hooked
! hooked
</pre></div>
<p>A different possibility would be using a function variable (which could be left out on passing the function variables to the hook):</p>
***************
*** 670,676 ****
<div class="codebox"><pre>
not hooked
! hooked
</pre></div>
</div>
--- 698,704 ----
<div class="codebox"><pre>
not hooked
! hooked
</pre></div>
</div>
|
|
From: Ruslan U. <rx...@ph...> - 2009-08-17 14:02:22
|
Author: rxu
Date: Mon Aug 17 14:25:04 2009
New Revision: 10004
Log:
Fix bug #49525 - Search for unreads should require login
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/language/en/search.php
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 Mon Aug 17 14:25:04 2009
***************
*** 223,228 ****
--- 223,229 ----
<li>[Change] Introduce new parameter to page_header() for forum specific who is online listings.</li>
<li>[Change] Lifted minimum requirement for Firebird DBMS from 2.0+ to 2.1+.</li>
<li>[Change] Unapproved topics can no longer be replied to (Bug #44005)</li>
+ <li>[Change] Require user to be registered and logged in to search for unread posts if topic read tracking is disabled for guests (Bug #49525)</li>
<li>[Change] Allow three-digit hex notation in Color BBcode. (Bug #39965 - Patch by m0rpha)</li>
<li>[Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)</li>
<li>[Feature] Backported 3.2 captcha plugins.
Modified: branches/phpBB-3_0_0/phpBB/language/en/search.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/search.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/search.php Mon Aug 17 14:25:04 2009
***************
*** 53,58 ****
--- 53,59 ----
'JUMP_TO_POST' => 'Jump to post',
'LOGIN_EXPLAIN_EGOSEARCH' => 'The board requires you to be registered and logged in to view your own posts.',
+ 'LOGIN_EXPLAIN_UNREADSEARCH'=> 'The board requires you to be registered and logged in to view your unread posts.',
'MAX_NUM_SEARCH_KEYWORDS_REFINE' => 'You specified too many words to search for. Please do not enter more than %1$d words.',
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 Mon Aug 17 14:25:04 2009
***************
*** 95,100 ****
--- 95,107 ----
}
}
+ // search for unread posts needs user to be logged in
+ // if topics tracking for guests is disabled
+ if ($search_id == 'unreadposts' && !$config['load_anon_lastread'] && !$user->data['is_registered'])
+ {
+ login_box('', $user->lang['LOGIN_EXPLAIN_UNREADSEARCH']);
+ }
+
// If we are looking for authors get their ids
$author_id_ary = array();
$sql_author_match = '';
|
|
From: Ruslan U. <rx...@ph...> - 2009-08-17 13:51:58
|
Author: rxu
Date: Mon Aug 17 14:32:41 2009
New Revision: 10006
Log:
Fix bug #43295 - Moved topics show unapproved even without permissions in the new forum
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/viewforum.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 Mon Aug 17 14:32:41 2009
***************
*** 195,200 ****
--- 195,201 ----
<li>[Fix] Fixed incorrect "topic does not exist" when unapproved posts were visited without global moderator permissions. (Bug #47795)</li>
<li>[Fix] Prevent style switcher from blocking the tab key. (Bug #49335)</li>
<li>[Fix] Correctly redirect on MCP main page after posts approval/disapproval from it. (Bug #49625)</li>
+ <li>[Fix] Do not display topic approval status image for shadow topic if a user is not a moderator in the forum the topic has been moved to. (Bug #43295)</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/viewforum.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/viewforum.php (original)
--- branches/phpBB-3_0_0/phpBB/viewforum.php Mon Aug 17 14:32:41 2009
***************
*** 620,627 ****
$view_topic_url_params = 'f=' . (($row['forum_id']) ? $row['forum_id'] : $forum_id) . '&t=' . $topic_id;
$view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params);
! $topic_unapproved = (!$row['topic_approved'] && $auth->acl_get('m_approve', $forum_id)) ? true : false;
! $posts_unapproved = ($row['topic_approved'] && $row['topic_replies'] < $row['topic_replies_real'] && $auth->acl_get('m_approve', $forum_id)) ? true : false;
$u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . "&t=$topic_id", true, $user->session_id) : '';
// Send vars to template
--- 620,627 ----
$view_topic_url_params = 'f=' . (($row['forum_id']) ? $row['forum_id'] : $forum_id) . '&t=' . $topic_id;
$view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params);
! $topic_unapproved = (!$row['topic_approved'] && $auth->acl_get('m_approve', (($row['forum_id']) ? $row['forum_id'] : $forum_id))) ? true : false;
! $posts_unapproved = ($row['topic_approved'] && $row['topic_replies'] < $row['topic_replies_real'] && $auth->acl_get('m_approve', (($row['forum_id']) ? $row['forum_id'] : $forum_id))) ? true : false;
$u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . "&t=$topic_id", true, $user->session_id) : '';
// Send vars to template
|
|
From: Ruslan U. <rx...@ph...> - 2009-08-17 13:29:08
|
Author: rxu
Date: Mon Aug 17 14:28:28 2009
New Revision: 10005
Log:
Add unread posts search support for cookie-based tracking
Authorised by: AcydBurn
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 Mon Aug 17 14:28:28 2009
***************
*** 1646,1652 ****
/**
* Get list of unread topics
- * only for registered users and non-cookie tracking
*
* @param int $user_id User ID (or false for current user)
* @param string $sql_extra Extra WHERE SQL statement
--- 1646,1651 ----
***************
*** 1664,1670 ****
}
$tracked_topics_list = $unread_topics_list = $read_topics_list = array();
! $tracked_forums_list = array();
if ($config['load_db_lastread'] && $user->data['is_registered'])
{
--- 1663,1669 ----
}
$tracked_topics_list = $unread_topics_list = $read_topics_list = array();
! $tracked_forums_list = $mark_time = array();
if ($config['load_db_lastread'] && $user->data['is_registered'])
{
***************
*** 1748,1755 ****
}
else if ($config['load_anon_lastread'] || $user->data['is_registered'])
{
! // We do not implement unread topics list for cookie based tracking
! // because it would require expensive database queries
}
return $unread_topics_list;
--- 1747,1806 ----
}
else if ($config['load_anon_lastread'] || $user->data['is_registered'])
{
! global $tracking_topics;
!
! if (!isset($tracking_topics) || !sizeof($tracking_topics))
! {
! $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_track'])) ? ((STRIP) ? stripslashes($_COOKIE[$config['cookie_name'] . '_track']) : $_COOKIE[$config['cookie_name'] . '_track']) : '';
! $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array();
! }
!
! if (!$user->data['is_registered'])
! {
! $user_lastmark = (isset($tracking_topics['l'])) ? base_convert($tracking_topics['l'], 36, 10) + $config['board_startdate'] : 0;
! }
! else
! {
! $user_lastmark = $user->data['user_lastmark'];
! }
!
! $sql = 'SELECT t.topic_id, t.forum_id, t.topic_last_post_time
! FROM ' . TOPICS_TABLE . ' t
! WHERE t.topic_last_post_time > ' . $user_lastmark . "
! $sql_extra
! ORDER BY t.topic_last_post_time DESC";
!
! $result = $db->sql_query_limit($sql, 1000);
!
! while ($row = $db->sql_fetchrow($result))
! {
! $forum_id = (int) $row['forum_id'];
! $topic_id = (int) $row['topic_id'];
! $topic_id36 = base_convert($topic_id, 10, 36);
!
! if (isset($tracking_topics['t'][$topic_id36]))
! {
! $last_read[$topic_id] = base_convert($tracking_topics['t'][$topic_id36], 36, 10) + $config['board_startdate'];
! if ($row['topic_last_post_time'] > $last_read[$topic_id])
! {
! $unread_topics_list[$topic_id] = $last_read[$topic_id];
! }
! }
! else if (isset($tracking_topics['f'][$forum_id]))
! {
! $mark_time[$forum_id] = base_convert($tracking_topics['f'][$forum_id], 36, 10) + $config['board_startdate'];
! if ($row['topic_last_post_time'] > $mark_time[$forum_id])
! {
! $unread_topics_list[$topic_id] = $mark_time[$forum_id];
! }
! }
! else
! {
! $unread_topics_list[$topic_id] = $user_lastmark;
! }
!
! }
! $db->sql_freeresult($result);
}
return $unread_topics_list;
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 Mon Aug 17 14:28:28 2009
***************
*** 372,379 ****
break;
case 'unreadposts':
- if ($config['load_db_lastread'] && $user->data['is_registered'])
- {
$l_search_title = $user->lang['SEARCH_UNREAD'];
// force sorting
$show_results = 'topics';
--- 372,377 ----
***************
*** 399,408 ****
$sql_sort";
$field = 'topic_id';
}
! break;
! }
! // Do nothing if it's cookie based read tracking
! // Just do not break and let user to see newposts
case 'newposts':
$l_search_title = $user->lang['SEARCH_NEW'];
--- 397,403 ----
$sql_sort";
$field = 'topic_id';
}
! break;
case 'newposts':
$l_search_title = $user->lang['SEARCH_NEW'];
|
|
From: Meik S. <acy...@ph...> - 2009-08-17 13:22:31
|
Author: acydburn
Date: Mon Aug 17 14:21:44 2009
New Revision: 10003
Log:
i am very very sorry for this hackish approach...
(ability to skip add_log calls)
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions.php
branches/phpBB-3_0_0/phpBB/includes/functions_user.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 Mon Aug 17 14:21:44 2009
***************
*** 3150,3155 ****
--- 3150,3163 ----
{
global $db, $user;
+ // In phpBB 3.1.x i want to have logging in a class to be able to control it
+ // For now, we need a quite hakish approach to circumvent logging for some actions
+ // @todo implement cleanly
+ if (!empty($GLOBALS['skip_add_log']))
+ {
+ return false;
+ }
+
$args = func_get_args();
$mode = array_shift($args);
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_user.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_user.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_user.php Mon Aug 17 14:21:44 2009
***************
*** 290,295 ****
--- 290,298 ----
if ($add_group_id)
{
+ // Because these actions only fill the log unneccessarily we skip the add_log() entry with a little hack. :/
+ $GLOBALS['skip_add_log'] = true;
+
// Add user to "newly registered users" group and set to default group if admin specified so.
if ($config['new_member_group_default'])
{
***************
*** 299,304 ****
--- 302,309 ----
{
group_user_add($add_group_id, $user_id);
}
+
+ unset($GLOBALS['skip_add_log']);
}
}
***************
*** 3519,3530 ****
$user_data = $user_row;
}
}
!
if (empty($user_data['user_new']))
{
return false;
}
!
$sql = 'SELECT group_id
FROM ' . GROUPS_TABLE . "
WHERE group_name = 'NEWLY_REGISTERED'
--- 3524,3535 ----
$user_data = $user_row;
}
}
!
if (empty($user_data['user_new']))
{
return false;
}
!
$sql = 'SELECT group_id
FROM ' . GROUPS_TABLE . "
WHERE group_name = 'NEWLY_REGISTERED'
|
|
From: Ruslan U. <rx...@ph...> - 2009-08-17 13:10:42
|
Author: rxu
Date: Mon Aug 17 14:09:54 2009
New Revision: 10002
Log:
Fix bug #49625 - Performing actions in Main MCP tab does not return correctly
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_front.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_front.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 Mon Aug 17 14:09:54 2009
***************
*** 194,199 ****
--- 194,200 ----
<li>[Fix] Fix who is online displaying incorrect data. (Bug #49485, thanks Brainy)</li>
<li>[Fix] Fixed incorrect "topic does not exist" when unapproved posts were visited without global moderator permissions. (Bug #47795)</li>
<li>[Fix] Prevent style switcher from blocking the tab key. (Bug #49335)</li>
+ <li>[Fix] Correctly redirect on MCP main page after posts approval/disapproval from it. (Bug #49625)</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/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 Mon Aug 17 14:09:54 2009
***************
*** 119,125 ****
--- 119,130 ----
$db->sql_freeresult($result);
}
+ $s_hidden_fields = build_hidden_fields(array(
+ 'redirect' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main')
+ ));
+
$template->assign_vars(array(
+ 'S_HIDDEN_FIELDS' => $s_hidden_fields,
'S_MCP_QUEUE_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue"),
));
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_front.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_front.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_front.html Mon Aug 17 14:09:54 2009
***************
*** 51,56 ****
--- 51,57 ----
<!-- IF .unapproved -->
<fieldset class="display-actions">
+ {S_HIDDEN_FIELDS}
<input class="button2" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" />
<input class="button1" type="submit" name="action[approve]" value="{L_APPROVE}" />
<div><a href="#" onclick="marklist('mcp_queue', 'post_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp_queue', 'post_id_list', false); return false;">{L_UNMARK_ALL}</a></div>
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_front.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_front.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_front.html Mon Aug 17 14:09:54 2009
***************
*** 35,41 ****
</tr>
<!-- ENDIF -->
<tr>
! <td class="cat" colspan="6" align="center"><input class="btnmain" type="submit" name="action[approve]" value="{L_APPROVE}" /> <input class="btnlite" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" /></td>
</tr>
</table>
{S_FORM_TOKEN}
--- 35,41 ----
</tr>
<!-- ENDIF -->
<tr>
! <td class="cat" colspan="6" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="action[approve]" value="{L_APPROVE}" /> <input class="btnlite" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" /></td>
</tr>
</table>
{S_FORM_TOKEN}
|
|
From: Andreas F. <ba...@ph...> - 2009-08-17 12:21:18
|
Author: bantu
Date: Mon Aug 17 13:19:44 2009
New Revision: 10001
Log:
Some rewording.
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 Mon Aug 17 13:19:44 2009
***************
*** 107,162 ****
<li>[Fix] Fix saving custom profile fields in ACP if Oracle used (Bug #46015)</li>
<li>[Fix] Make view_log() more resilient to corrupt serialized data. (Bug #46545)</li>
<li>[Fix] Show error if hostname lookup doesn't return a valid IP address when banning. (Bug #45585 - Patch by bantu)</li>
! <li>[Fix] Incorrect layout when loading PM-draft (Bug #38435 - Patch by nickvergessen)</li>
! <li>[Fix] Wrong message shown to user, when adding bots to friends/foes. (Bug #40205 - Patch by nickvergessen)</li>
<li>[Fix] Fix Oracle database backup (Bug #46715)</li>
<li>[Fix] Update attachments table when deleting user and retaining his posts. (Bug #40245 - Patch by rxu)</li>
! <li>[Fix] Template cache error for files of template-subfolders (Bug #46145 - Patch by nickvergessen)</li>
<li>[Fix] Display user's Jabber address in popup when Jabber functionality is disabled (Bug #20775 - Patch by nickvergessen)</li>
! <li>[Fix] Exclude forum from active topics option is ignored (Bug #19135 - Patch by nickvergessen)</li>
<li>[Fix] Do not display birthdays of banned users (Bug #20625 - Patch by nickvergessen)</li>
<li>[Fix] Fix function to recalculate Nested Sets (Bug #41555 - Patch by EXreaction)</li>
! <li>[Fix] Display and highlight already used rank images while assigning new rank (Bug #22665 - Patch by nickvergessen)</li>
<li>[Fix] Correctly orientate quoted text image on RTL languages (Bug #33745 - Patch by nickvergessen)</li>
<li>[Fix] Do not display "View user notes" and "Warn user" links in user profile if corresponding MCP modules are disabled. (Bug #10519 - Patch by rxu)</li>
! <li>[Fix] Empty error message in UCP folder management when creating folder without name (Bug #39875 - Patch by nickvergessen)</li>
! <li>[Fix] Wrong description in UCP group management implicates missing feature (Bug #19945 - Patch by nickvergessen)</li>
<li>[Fix] Do not throw an error when PDO is a shared module and not loaded preventing SQLite from being loaded.</li>
! <li>[Fix] Fix unicode words censoring. (Bug #16555 - Patches by rxu)</li>
<li>[Fix] Display coloured usernames in ACP groups management screens</li>
<li>[Fix] Correctly describe founder permissions on trace-information (Bug #37235 - Patch by nickvergessen)</li>
<li>[Fix] Correct the width value for poll_center.gif omitted in imageset.cfg for subsilver2. (Bug #43005 - Patch by rxu)</li>
<li>[Fix] Correctly load complex language variable using acp_language (Bug #45735 - Patch by leviatan21)</li>
! <li>[Fix] Fixed reapply_sid() to correctly strip session id in certain circumstances (Bug #43125 - Patch by leviatan21)</li>
<li>[Fix] Correctly state why one language pack is marked with an asterisk in the ACP. (Bug #37565 - Patch by bantu)</li>
<li>[Fix] Correctly check if install directory is still present. (Bug #46965 - Patch by rxu)</li>
<li>[Fix] Correct banned user behaviour when "force password change" is enabled (Bug #47145 - Patch by nickvergessen and leviatan21 )</li>
<li>[Fix] Correctly display ACP logs options, without permission to clear logs. (Bug #24155 - Patch by leviatan21)</li>
<li>[Fix] Display topic icons in MCP forum view again (only prosilver).</li>
<li>[Fix] Properly display post status messages in topic when post is reported and unapproved (Bug #44455 - Patch by leviatan21)</li>
! <li>[Fix] Loading draft removes recipients when replying to PM (Bug #38395 - Patch by nickvergessen)</li>
! <li>[Fix] Add poster-name to moderator-log when deleting post/topic (Bug #46225 - Patch by nickvergessen)</li>
! <li>[Fix] "Report details" link broken in MCP (Bug #46975 - Patch by nickvergessen)</li>
<li>[Fix] Resolve accesskey conflicts in prosilver. (Bug #44685 - Patch by bantu)</li>
<li>[Fix] Check if template file is empty before trying to read from it. (Bug #47345 - Patch by bantu)</li>
<li>[Fix] Correct descriptions of the permissions to use BBCode, smilies, images and flash to be more relevant. (Bug #36065 - Patch by rxu)</li>
<li>[Fix] Fix style issues in print mode. (Bug #26375 - Patch by leviatan21)</li>
<li>[Fix] Fix minor issue with L_QUOTE language string missing in several PM composing modes. (Bug #39625 - Patch by rxu)</li>
! <li>[Fix] Color bbcode now supports three-digit hex notation. (Bug #39965 - Patch by m0rpha)</li>
! <li>[Fix] Search by authorname does not display posts of guests and deleted or deactivated users (Bug #36565, #47765 - Patch by nickvergessen)</li>
! <li>[Fix] View end of ban in MCP and ACP when user is banned by duration (Bug #47815 - Patch by Pyramide)</li>
! <li>[Fix] Wrong count of posts awaiting approval in MCP. (Bug #47685 - Patch by nickvergessen)</li>
<li>[Fix] Display user's posts count in private message when it is equal to 0 (prosilver). (Bug #40155 - Patch by rxu)</li>
! <li>[Fix] Disable word-censor option in UCP lacks the config-setting (Bug #47575 - Patch by 00mohgta7)</li>
<li>[Fix] Fix database updater and db tools to support multiple column changes/additions/removals with SQLite</li>
<li>[Fix] Correctly detect GZIP status in debug mode. (Bug #24075 - Patch by rxu)</li>
<li>[Fix] Posting smilies in view more smilies now work again in IE (Bug #46025 - Patch by leviatan21)</li>
! <li>[Fix] Properly convert and show filesize information (Bug #47775 - Patch by bantu)</li>
<li>[Fix] Add ability to prune users who never logged in. (Bug #44295 - Patch by rxu)</li>
! <li>[Fix] Smilies and images not viewed in topic-print view (Bug #47265 - Patch by nickvergessen)</li>
! <li>[Fix] Force full date for PMs print-view (Patch by nickvergessen)</li>
<li>[Fix] Fix "Always show a scrollbar for short pages" for IE8 and Firefox 3.5 (Bug #47865 - Patch by stokerpiller)</li>
! <li>[Fix] Do not allow setting group as default group for pending user (Bug #45675 - Patch by nickvergessen)</li>
<li>[Fix] Fail gracefully if store folder is not writable during update. (Bugs #46615, #46945)</li>
<li>[Fix] Hide profile-icon from viewtopic-page if user has no permissions (subsilver2 only) (Bug #37635 - Patch by leviatan21)</li>
<li>[Fix] Correct escaping/unescaping in the LDAP authentication plugin. (Bug #48175)</li>
--- 107,161 ----
<li>[Fix] Fix saving custom profile fields in ACP if Oracle used (Bug #46015)</li>
<li>[Fix] Make view_log() more resilient to corrupt serialized data. (Bug #46545)</li>
<li>[Fix] Show error if hostname lookup doesn't return a valid IP address when banning. (Bug #45585 - Patch by bantu)</li>
! <li>[Fix] Fix incorrect layout when loading private message draft. (Bug #38435 - Patch by nickvergessen)</li>
! <li>[Fix] Show proper error message when trying to add bots to friends/foes list. (Bug #40205 - Patch by nickvergessen)</li>
<li>[Fix] Fix Oracle database backup (Bug #46715)</li>
<li>[Fix] Update attachments table when deleting user and retaining his posts. (Bug #40245 - Patch by rxu)</li>
! <li>[Fix] Correctly detect files in subfolders when viewing cached template files. (Bug #46145 - Patch by nickvergessen)</li>
<li>[Fix] Display user's Jabber address in popup when Jabber functionality is disabled (Bug #20775 - Patch by nickvergessen)</li>
! <li>[Fix] Correctly exclude forums from active topics list. (Bug #19135 - Patch by nickvergessen)</li>
<li>[Fix] Do not display birthdays of banned users (Bug #20625 - Patch by nickvergessen)</li>
<li>[Fix] Fix function to recalculate Nested Sets (Bug #41555 - Patch by EXreaction)</li>
! <li>[Fix] Display but also highlight already used rank images when creating new ranks. (Bug #22665 - Patch by nickvergessen)</li>
<li>[Fix] Correctly orientate quoted text image on RTL languages (Bug #33745 - Patch by nickvergessen)</li>
<li>[Fix] Do not display "View user notes" and "Warn user" links in user profile if corresponding MCP modules are disabled. (Bug #10519 - Patch by rxu)</li>
! <li>[Fix] Show proper error message when trying to create a private messages folder with an empty name. (Bug #39875 - Patch by nickvergessen)</li>
! <li>[Fix] No longer state that it is possible to manage group leaders from the UCP. (Bug #19945 - Patch by nickvergessen)</li>
<li>[Fix] Do not throw an error when PDO is a shared module and not loaded preventing SQLite from being loaded.</li>
! <li>[Fix] Fix censoring of unicode words. (Bug #16555 - Patches by rxu)</li>
<li>[Fix] Display coloured usernames in ACP groups management screens</li>
<li>[Fix] Correctly describe founder permissions on trace-information (Bug #37235 - Patch by nickvergessen)</li>
<li>[Fix] Correct the width value for poll_center.gif omitted in imageset.cfg for subsilver2. (Bug #43005 - Patch by rxu)</li>
<li>[Fix] Correctly load complex language variable using acp_language (Bug #45735 - Patch by leviatan21)</li>
! <li>[Fix] Fix reapply_sid() to correctly strip session id in certain circumstances (Bug #43125 - Patch by leviatan21)</li>
<li>[Fix] Correctly state why one language pack is marked with an asterisk in the ACP. (Bug #37565 - Patch by bantu)</li>
<li>[Fix] Correctly check if install directory is still present. (Bug #46965 - Patch by rxu)</li>
<li>[Fix] Correct banned user behaviour when "force password change" is enabled (Bug #47145 - Patch by nickvergessen and leviatan21 )</li>
<li>[Fix] Correctly display ACP logs options, without permission to clear logs. (Bug #24155 - Patch by leviatan21)</li>
<li>[Fix] Display topic icons in MCP forum view again (only prosilver).</li>
<li>[Fix] Properly display post status messages in topic when post is reported and unapproved (Bug #44455 - Patch by leviatan21)</li>
! <li>[Fix] Do not remove recipients when loading private message draft. (Bug #38395 - Patch by nickvergessen)</li>
! <li>[Fix] Add author name to moderator log when deleting post/topic. (Bug #46225 - Patch by nickvergessen)</li>
! <li>[Fix] Fix broken "Report details" link in the MCP. (Bug #46975 - Patch by nickvergessen)</li>
<li>[Fix] Resolve accesskey conflicts in prosilver. (Bug #44685 - Patch by bantu)</li>
<li>[Fix] Check if template file is empty before trying to read from it. (Bug #47345 - Patch by bantu)</li>
<li>[Fix] Correct descriptions of the permissions to use BBCode, smilies, images and flash to be more relevant. (Bug #36065 - Patch by rxu)</li>
<li>[Fix] Fix style issues in print mode. (Bug #26375 - Patch by leviatan21)</li>
<li>[Fix] Fix minor issue with L_QUOTE language string missing in several PM composing modes. (Bug #39625 - Patch by rxu)</li>
! <li>[Fix] Also fetch posts of guests and deleted or deactivated users when searching for author names. (Bug #36565, #47765 - Patch by nickvergessen)</li>
! <li>[Fix] Show end of ban in MCP and ACP when user is banned by duration. (Bug #47815 - Patch by Pyramide)</li>
! <li>[Fix] Correctly count posts awaiting approval in the MCP. (Bug #47685 - Patch by nickvergessen)</li>
<li>[Fix] Display user's posts count in private message when it is equal to 0 (prosilver). (Bug #40155 - Patch by rxu)</li>
! <li>[Fix] Only allow users to disable word censor if globally allowed. (Bug #47575 - Patch by 00mohgta7)</li>
<li>[Fix] Fix database updater and db tools to support multiple column changes/additions/removals with SQLite</li>
<li>[Fix] Correctly detect GZIP status in debug mode. (Bug #24075 - Patch by rxu)</li>
<li>[Fix] Posting smilies in view more smilies now work again in IE (Bug #46025 - Patch by leviatan21)</li>
! <li>[Fix] Properly convert and show filesize information. (Bug #47775 - Patch by bantu)</li>
<li>[Fix] Add ability to prune users who never logged in. (Bug #44295 - Patch by rxu)</li>
! <li>[Fix] Show smilies and images in topic print view. (Bug #47265 - Patch by nickvergessen)</li>
! <li>[Fix] Force full date in private message print view. (Patch by nickvergessen)</li>
<li>[Fix] Fix "Always show a scrollbar for short pages" for IE8 and Firefox 3.5 (Bug #47865 - Patch by stokerpiller)</li>
! <li>[Fix] Do not allow setting group as default group for pending users. (Bug #45675 - Patch by nickvergessen)</li>
<li>[Fix] Fail gracefully if store folder is not writable during update. (Bugs #46615, #46945)</li>
<li>[Fix] Hide profile-icon from viewtopic-page if user has no permissions (subsilver2 only) (Bug #37635 - Patch by leviatan21)</li>
<li>[Fix] Correct escaping/unescaping in the LDAP authentication plugin. (Bug #48175)</li>
***************
*** 223,228 ****
--- 222,228 ----
<li>[Change] Introduce new parameter to page_header() for forum specific who is online listings.</li>
<li>[Change] Lifted minimum requirement for Firebird DBMS from 2.0+ to 2.1+.</li>
<li>[Change] Unapproved topics can no longer be replied to (Bug #44005)</li>
+ <li>[Change] Allow three-digit hex notation in Color BBcode. (Bug #39965 - Patch by m0rpha)</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>
|
|
From: Joas S. <nic...@ph...> - 2009-08-17 09:46:11
|
Author: nickvergessen
Date: Mon Aug 17 10:45:22 2009
New Revision: 10000
Log:
Fix r9961 - populate who is online only where required
Authorised by: AcydBurn
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 Mon Aug 17 10:45:22 2009
***************
*** 2706,2712 ****
}
else
{
! page_header((!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang[$title]);
}
$template->set_filenames(array(
--- 2706,2712 ----
}
else
{
! page_header(((!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang[$title]), false);
}
$template->set_filenames(array(
***************
*** 3028,3034 ****
$template->assign_var('LOGIN_ERROR', $user->lang['WRONG_PASSWORD']);
}
! page_header($user->lang['LOGIN']);
$template->assign_vars(array(
'S_HIDDEN_FIELDS' => build_hidden_fields(array('f' => $forum_data['forum_id'])))
--- 3028,3034 ----
$template->assign_var('LOGIN_ERROR', $user->lang['WRONG_PASSWORD']);
}
! page_header($user->lang['LOGIN'], false);
$template->assign_vars(array(
'S_HIDDEN_FIELDS' => build_hidden_fields(array('f' => $forum_data['forum_id'])))
***************
*** 3592,3598 ****
}
else
{
! page_header($msg_title);
}
}
--- 3592,3598 ----
}
else
{
! page_header($msg_title, false);
}
}
|
|
From: Henry S. <kel...@ph...> - 2009-08-16 21:21:19
|
Author: Kellanved
Date: Sun Aug 16 22:21:04 2009
New Revision: 9999
Log:
erm, on the contrary; can that reset call
Modified:
branches/phpBB-3_0_0/phpBB/posting.php
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 Aug 16 22:21:04 2009
***************
*** 1121,1126 ****
--- 1121,1131 ----
// The last parameter tells submit_post if search indexer has to be run
$redirect_url = submit_post($mode, $post_data['post_subject'], $post_data['username'], $post_data['topic_type'], $poll, $data, $update_message, ($update_message || $update_subject) ? true : false);
+
+ if ($config['enable_post_confirm'] && !$user->data['is_registered'] && (isset($captcha) && $captcha->is_solved() === true) && ($mode == 'post' || $mode == 'reply' || $mode == 'quote'))
+ {
+ $captcha->reset();
+ }
// Check the permissions for post approval. Moderators are not affected.
if (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id']))
{
|
|
From: Henry S. <kel...@ph...> - 2009-08-16 21:12:01
|
Author: Kellanved
Date: Sun Aug 16 22:11:17 2009
New Revision: 9998
Log:
erm, on the contrary; can that reset call
Modified:
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
branches/phpBB-3_0_0/phpBB/posting.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 Sun Aug 16 22:11:17 2009
***************
*** 354,360 ****
if (strlen($error))
{
// okay, incorrect answer. Let's ask a new question.
! // $this->new_attempt();
$this->solved = false;
return $error;
}
--- 354,360 ----
if (strlen($error))
{
// okay, incorrect answer. Let's ask a new question.
! $this->new_attempt();
$this->solved = false;
return $error;
}
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 Aug 16 22:11:17 2009
***************
*** 1121,1131 ****
// The last parameter tells submit_post if search indexer has to be run
$redirect_url = submit_post($mode, $post_data['post_subject'], $post_data['username'], $post_data['topic_type'], $poll, $data, $update_message, ($update_message || $update_subject) ? true : false);
- if ($config['enable_post_confirm'] && !$user->data['is_registered'] && in_array($mode, array('quote', 'post', 'reply')))
- {
- $captcha->reset();
- }
-
// Check the permissions for post approval. Moderators are not affected.
if (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id']))
{
--- 1121,1126 ----
***************
*** 1369,1375 ****
// Posting uses is_solved for legacy reasons. Plugins have to use is_solved to force themselves to be displayed.
if ($config['enable_post_confirm'] && !$user->data['is_registered'] && (isset($captcha) && $captcha->is_solved() === false) && ($mode == 'post' || $mode == 'reply' || $mode == 'quote'))
{
- $captcha->reset();
$template->assign_vars(array(
'S_CONFIRM_CODE' => true,
--- 1364,1369 ----
|
7 messages has been excluded from this view by a project administrator.
