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: Henry S. <kel...@ph...> - 2009-08-04 15:37:26
|
Author: Kellanved
Date: Tue Aug 4 16:36:39 2009
New Revision: 9922
Log:
use new flag to place captcha errors in the error log (if debug is set)
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 Tue Aug 4 16:36:39 2009
***************
*** 262,267 ****
--- 262,269 ----
<li>[Feature] Ability to control the display of custom profile fields on viewtopic (Bug #48985).</li>
<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>
|
|
From: Henry S. <kel...@ph...> - 2009-08-04 15:35:37
|
Author: Kellanved
Date: Tue Aug 4 16:34:45 2009
New Revision: 9921
Log:
use new flag to place captcha errors in the error log (if debug is set)
Modified:
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php Tue Aug 4 16:34:45 2009
***************
*** 66,71 ****
--- 66,72 ----
$this->seed -= 0x7fffffff * floor($this->seed / 0x7fffffff);
$captcha = new captcha();
+ define('IMAGE_OUTPUT', 1);
$captcha->execute($this->code, $this->seed);
}
***************
*** 80,85 ****
--- 81,87 ----
}
}
$captcha = new captcha();
+ define('IMAGE_OUTPUT', 1);
$captcha->execute($this->code, $this->seed);
}
|
|
From: Henry S. <kel...@ph...> - 2009-08-04 15:34:50
|
Author: Kellanved
Date: Tue Aug 4 16:34:04 2009
New Revision: 9920
Log:
add the option to place image debugging information to the log
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions.php
branches/phpBB-3_0_0/phpBB/language/en/acp/common.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 4 16:34:04 2009
***************
*** 3465,3472 ****
// remove complete path to installation, with the risk of changing backslashes meant to be there
$errfile = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $errfile);
$msg_text = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $msg_text);
-
echo '<b>[phpBB Debug] PHP Notice</b>: in file <b>' . $errfile . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br />' . "\n";
// echo '<br /><br />BACKTRACE<br />' . get_backtrace() . '<br />' . "\n";
}
--- 3465,3477 ----
// remove complete path to installation, with the risk of changing backslashes meant to be there
$errfile = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $errfile);
$msg_text = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $msg_text);
echo '<b>[phpBB Debug] PHP Notice</b>: in file <b>' . $errfile . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br />' . "\n";
+
+ // we are writing an image - the user won't see the debug, so let's place it in the log
+ if (defined('IMAGE_OUTPUT'))
+ {
+ add_log('critical', 'LOG_IMAGE_GENERATION_ERROR', $errfile, $errline, $msg_text);
+ }
// echo '<br /><br />BACKTRACE<br />' . get_backtrace() . '<br />' . "\n";
}
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/common.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/common.php Tue Aug 4 16:34:04 2009
***************
*** 574,579 ****
--- 574,581 ----
'LOG_USERS_APPROVED' => '<strong>Users approved in usergroup</strong> %1$s<br />» %2$s',
'LOG_USERS_PENDING' => '<strong>Users requested to join group â%1$sâ and need to be approved</strong><br />» %2$s',
+ 'LOG_IMAGE_GENERATION_ERROR' => '<strong>Error while creating image</strong><br />» Error in %1$s on line %2$s: %3$s',
+
'LOG_IMAGESET_ADD_DB' => '<strong>Added new imageset to database</strong><br />» %s',
'LOG_IMAGESET_ADD_FS' => '<strong>Add new imageset on filesystem</strong><br />» %s',
'LOG_IMAGESET_DELETE' => '<strong>Deleted imageset</strong><br />» %s',
|
|
From: Meik S. <acy...@ph...> - 2009-08-04 14:16:04
|
Author: acydburn
Date: Tue Aug 4 15:15:13 2009
New Revision: 9919
Log:
Separate PM Reply and PM Reply to all in prosilver.
Style changes by dhn
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_compose.php
branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewmessage.php
branches/phpBB-3_0_0/phpBB/language/en/ucp.php
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_message_header.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/colours.css
branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/cp.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 4 15:15:13 2009
***************
*** 141,147 ****
<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>
--- 141,147 ----
<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>
***************
*** 261,266 ****
--- 261,267 ----
<li>[Feature] Ability to copy permissions from one forum to several other forums.</li>
<li>[Feature] Ability to control the display of custom profile fields on viewtopic (Bug #48985).</li>
<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>
</ul>
<a name="v304"></a><h3>1.ii. Changes since 3.0.4</h3>
Modified: branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_compose.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_compose.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_compose.php Tue Aug 4 15:15:13 2009
***************
*** 46,51 ****
--- 46,54 ----
$draft_id = request_var('d', 0);
$lastclick = request_var('lastclick', 0);
+ // Reply to all triggered (quote/reply)
+ $reply_to_all = request_var('reply_to_all', 0);
+
// Do NOT use request_var or specialchars here
$address_list = isset($_REQUEST['address_list']) ? $_REQUEST['address_list'] : array();
***************
*** 84,90 ****
}
redirect(append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm'));
}
!
// Since viewtopic.php language entries are used in several modes,
// we include the language file here
$user->add_lang('viewtopic');
--- 87,93 ----
}
redirect(append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm'));
}
!
// Since viewtopic.php language entries are used in several modes,
// we include the language file here
$user->add_lang('viewtopic');
***************
*** 314,326 ****
if (($action == 'reply' || $action == 'quote' || $action == 'quotepost') && !sizeof($address_list) && !$refresh && !$submit && !$preview)
{
! if ($action == 'quotepost')
{
$address_list = array('u' => array($post['author_id'] => 'to'));
}
else
{
! // We try to include every previously listed member from the TO Header
$address_list = rebuild_header(array('to' => $post['to_address']));
// Add the author (if he is already listed then this is no shame (it will be overwritten))
--- 317,330 ----
if (($action == 'reply' || $action == 'quote' || $action == 'quotepost') && !sizeof($address_list) && !$refresh && !$submit && !$preview)
{
! // Add the original author as the recipient if quoting a post or only replying and not having checked "reply to all"
! if ($action == 'quotepost' || !$reply_to_all)
{
$address_list = array('u' => array($post['author_id'] => 'to'));
}
else
{
! // We try to include every previously listed member from the TO Header - Reply to all
$address_list = rebuild_header(array('to' => $post['to_address']));
// Add the author (if he is already listed then this is no shame (it will be overwritten))
***************
*** 443,449 ****
$max_recipients = (!$max_recipients) ? $config['pm_max_recipients'] : $max_recipients;
// If this is a quote/reply "to all"... we may increase the max_recpients to the number of original recipients
! if (($action == 'reply' || $action == 'quote') && $max_recipients)
{
// We try to include every previously listed member from the TO Header
$list = rebuild_header(array('to' => $post['to_address']));
--- 447,453 ----
$max_recipients = (!$max_recipients) ? $config['pm_max_recipients'] : $max_recipients;
// If this is a quote/reply "to all"... we may increase the max_recpients to the number of original recipients
! if (($action == 'reply' || $action == 'quote') && $max_recipients && $reply_to_all)
{
// We try to include every previously listed member from the TO Header
$list = rebuild_header(array('to' => $post['to_address']));
Modified: branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewmessage.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewmessage.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewmessage.php Tue Aug 4 15:15:13 2009
***************
*** 169,174 ****
--- 169,177 ----
$url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm');
+ // Number of "to" recipients
+ $num_recipients = (int) preg_match_all('/:?(u|g)_([0-9]+):?/', $message_row['to_address'], $match);
+
$template->assign_vars(array(
'MESSAGE_AUTHOR_FULL' => get_username_string('full', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']),
'MESSAGE_AUTHOR_COLOUR' => get_username_string('colour', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']),
***************
*** 215,227 ****
--- 218,234 ----
'U_QUOTE' => ($auth->acl_get('u_sendpm') && $author_id != ANONYMOUS) ? "$url&mode=compose&action=quote&f=$folder_id&p=" . $message_row['msg_id'] : '',
'U_EDIT' => (($message_row['message_time'] > time() - ($config['pm_edit_time'] * 60) || !$config['pm_edit_time']) && $folder_id == PRIVMSGS_OUTBOX && $auth->acl_get('u_pm_edit')) ? "$url&mode=compose&action=edit&f=$folder_id&p=" . $message_row['msg_id'] : '',
'U_POST_REPLY_PM' => ($auth->acl_get('u_sendpm') && $author_id != ANONYMOUS) ? "$url&mode=compose&action=reply&f=$folder_id&p=" . $message_row['msg_id'] : '',
+ 'U_POST_REPLY_ALL' => ($auth->acl_get('u_sendpm') && $author_id != ANONYMOUS) ? "$url&mode=compose&action=reply&f=$folder_id&reply_to_all=1&p=" . $message_row['msg_id'] : '',
'U_PREVIOUS_PM' => "$url&f=$folder_id&p=" . $message_row['msg_id'] . "&view=previous",
'U_NEXT_PM' => "$url&f=$folder_id&p=" . $message_row['msg_id'] . "&view=next",
+ 'U_PM_ACTION' => $url . '&mode=compose&f=' . $folder_id . '&p=' . $message_row['msg_id'],
+
'S_HAS_ATTACHMENTS' => (sizeof($attachments)) ? true : false,
'S_DISPLAY_NOTICE' => $display_notice && $message_row['message_attachment'],
'S_AUTHOR_DELETED' => ($author_id == ANONYMOUS) ? true : false,
'S_SPECIAL_FOLDER' => in_array($folder_id, array(PRIVMSGS_NO_BOX, PRIVMSGS_OUTBOX)),
+ 'S_PM_RECIPIENTS' => $num_recipients,
'U_PRINT_PM' => ($config['print_pm'] && $auth->acl_get('u_pm_printpm')) ? "$url&f=$folder_id&p=" . $message_row['msg_id'] . "&view=print" : '',
'U_FORWARD_PM' => ($config['forward_pm'] && $auth->acl_get('u_sendpm') && $auth->acl_get('u_pm_forward')) ? "$url&mode=compose&action=forward&f=$folder_id&p=" . $message_row['msg_id'] : '')
Modified: branches/phpBB-3_0_0/phpBB/language/en/ucp.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/ucp.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/ucp.php Tue Aug 4 15:15:13 2009
***************
*** 374,379 ****
--- 374,380 ----
'RENAME' => 'Rename',
'RENAME_FOLDER' => 'Rename folder',
'REPLIED_MESSAGE' => 'Replied to message',
+ 'REPLY_TO_ALL' => 'Reply to sender and all recipients.',
'REPORT_PM' => 'Report private message',
'RESIGN_SELECTED' => 'Resign selected',
'RETURN_FOLDER' => '%1$sReturn to previous folder%2$s',
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_message_header.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_message_header.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_message_header.html Tue Aug 4 15:15:13 2009
***************
*** 1,22 ****
<h2>{L_TITLE}<!-- IF CUR_FOLDER_NAME -->: {CUR_FOLDER_NAME}<!-- ENDIF --></h2>
! <form id="viewfolder" method="post" action="{S_PM_ACTION}">
!
! <div class="panel">
<div class="inner"><span class="corners-top"><span></span></span>
<!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF -->
!
<!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM -->
<div class="buttons">
! <!-- IF U_POST_REPLY_PM --><div class="pmreply-icon"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div>
<!-- ELSEIF U_POST_NEW_TOPIC --><div class="newpm-icon"><a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}"><span></span>{L_UCP_PM_COMPOSE}</a></div><!-- ENDIF -->
<!-- IF U_FORWARD_PM --><div class="forwardpm-icon"><a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}"><span></span>{L_FORWARD_PM}</a></div><!-- ENDIF -->
</div>
<!-- ENDIF -->
<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
! <ul class="linklist">
<li class="rightside pagination">
<!-- IF S_VIEW_MESSAGE --><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO} {CUR_FOLDER_NAME}</a><!-- ENDIF -->
<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
--- 1,30 ----
<h2>{L_TITLE}<!-- IF CUR_FOLDER_NAME -->: {CUR_FOLDER_NAME}<!-- ENDIF --></h2>
! <div class="panel clearfix pm-panel-header<!-- IF S_VIEW_MESSAGE --> pm<!-- ENDIF -->">
<div class="inner"><span class="corners-top"><span></span></span>
<!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF -->
!
<!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM -->
+ <form method="post" action="{U_PM_ACTION}" id="reply-form">
+
<div class="buttons">
! <!-- IF U_POST_REPLY_PM --><div class="pmreply-icon clearfix"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div>
<!-- ELSEIF U_POST_NEW_TOPIC --><div class="newpm-icon"><a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}"><span></span>{L_UCP_PM_COMPOSE}</a></div><!-- ENDIF -->
<!-- IF U_FORWARD_PM --><div class="forwardpm-icon"><a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}"><span></span>{L_FORWARD_PM}</a></div><!-- ENDIF -->
</div>
+
+ <!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 -->
+ <div class="reply-all"><a title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">» {L_REPLY_TO_ALL}</a></div>
+ <!-- ENDIF -->
+
+ <input type="hidden" name="action" value="" id="reply-action" />
+
+ </form>
<!-- ENDIF -->
<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
! <ul class="linklist pm-return-to">
<li class="rightside pagination">
<!-- IF S_VIEW_MESSAGE --><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO} {CUR_FOLDER_NAME}</a><!-- ENDIF -->
<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
***************
*** 26,28 ****
--- 34,40 ----
</li>
</ul>
<!-- ENDIF -->
+ </div>
+ </div>
+
+ <form id="viewfolder" method="post" action="{S_PM_ACTION}">
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html Tue Aug 4 15:15:13 2009
***************
*** 2,10 ****
<!-- IF not PROMPT -->
<!-- INCLUDE ucp_pm_message_header.html -->
<!-- ENDIF -->
-
<!-- IF PROMPT -->
<h2>{L_EXPORT_AS_CSV}</h2>
<form id="viewfolder" method="post" action="{S_PM_ACTION}">
--- 2,10 ----
<!-- IF not PROMPT -->
<!-- INCLUDE ucp_pm_message_header.html -->
+ <div class="panel pm-panel-message"><div>
<!-- ENDIF -->
<!-- IF PROMPT -->
<h2>{L_EXPORT_AS_CSV}</h2>
<form id="viewfolder" method="post" action="{S_PM_ACTION}">
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html Tue Aug 4 15:15:13 2009
***************
*** 1,20 ****
! <!-- INCLUDE ucp_header.html -->
<!-- INCLUDE ucp_pm_message_header.html -->
- <span class="corners-bottom"><span></span></span></div>
- </div>
<!-- IF S_DISPLAY_HISTORY and (U_VIEW_PREVIOUS_HISTORY or U_VIEW_NEXT_HISTORY) -->
! <fieldset class="display-options clearfix">
<!-- IF U_VIEW_PREVIOUS_HISTORY --><a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_HISTORY}</a><!-- ENDIF -->
<!-- IF U_VIEW_NEXT_HISTORY --><a href="{U_VIEW_NEXT_HISTORY}" class="right-box {S_CONTENT_FLOW_END}">{L_VIEW_NEXT_HISTORY}</a><!-- ENDIF -->
</fieldset>
<!-- ENDIF -->
! <div id="post-{MESSAGE_ID}" class="post pm<!-- IF S_POST_UNAPPROVED or S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF S_ONLINE --> online<!-- ENDIF -->">
! <div class="inner"><span class="corners-top"><span></span></span>
<div class="postbody">
--- 1,18 ----
! <!-- INCLUDE ucp_header.html -->
<!-- INCLUDE ucp_pm_message_header.html -->
<!-- IF S_DISPLAY_HISTORY and (U_VIEW_PREVIOUS_HISTORY or U_VIEW_NEXT_HISTORY) -->
! <fieldset class="display-options clearfix bg1 pm-message-nav">
<!-- IF U_VIEW_PREVIOUS_HISTORY --><a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_HISTORY}</a><!-- ENDIF -->
<!-- IF U_VIEW_NEXT_HISTORY --><a href="{U_VIEW_NEXT_HISTORY}" class="right-box {S_CONTENT_FLOW_END}">{L_VIEW_NEXT_HISTORY}</a><!-- ENDIF -->
</fieldset>
<!-- ENDIF -->
! <div id="post-{MESSAGE_ID}" class="panel clearfix post pm-panel-message pm<!-- IF S_POST_UNAPPROVED or S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF S_ONLINE --> online<!-- ENDIF -->">
! <div>
<div class="postbody">
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 4 15:15:13 2009
***************
*** 868,873 ****
--- 868,879 ----
color: #000000 !important;
}
+ /* PM panel adjustments */
+ .pm-panel-header,
+ #cp-main .pm-message-nav {
+ border-bottom-color: #A4B3BF;
+ }
+
/* PM marking colours */
.pmlist li.pm_message_reported_colour, .pm_message_reported_colour {
border-left-color: #BC2A4D;
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/cp.css
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/cp.css (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/cp.css Tue Aug 4 15:15:13 2009
***************
*** 348,353 ****
--- 348,381 ----
line-height: 2.5em;
}
+ /* PM panel adjustments */
+ .pm-panel-header {
+ margin: 0;
+ padding-bottom: 10px;
+ border-bottom: 1px dashed #A4B3BF;
+ }
+
+ .reply-all {
+ display: block;
+ padding-top: 4px;
+ clear: both;
+ float: left;
+ }
+
+ .pm-panel-message {
+ padding-top: 10px;
+ }
+
+ .pm-return-to {
+ padding-top: 23px;
+ }
+
+ #cp-main .pm-message-nav {
+ margin: 0;
+ padding: 2px 10px 5px 10px;
+ border-bottom: 1px dashed #A4B3BF;
+ }
+
/* PM Message history */
.current {
color: #999999;
|
|
From: Meik S. <acy...@ph...> - 2009-08-04 13:09:13
|
Author: acydburn
Date: Tue Aug 4 14:08:26 2009
New Revision: 9918
Log:
Even if the recipient of a PM is now inactive (for whatever reason) still display the information in PM recipient lists and do not hide it
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions_privmsgs.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_privmsgs.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_privmsgs.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_privmsgs.php Tue Aug 4 14:08:26 2009
***************
*** 1145,1152 ****
{
$sql = 'SELECT user_id, username, user_colour
FROM ' . USERS_TABLE . '
! WHERE ' . $db->sql_in_set('user_id', $u) . '
! AND user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')';
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
--- 1145,1151 ----
{
$sql = 'SELECT user_id, username, user_colour
FROM ' . USERS_TABLE . '
! WHERE ' . $db->sql_in_set('user_id', $u);
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
|
|
From: Joas S. <nic...@ph...> - 2009-08-04 10:05:42
|
Author: nickvergessen
Date: Tue Aug 4 11:04:54 2009
New Revision: 9917
Log:
Fix Bug #49035 - Fix general error while registration, through undefined variable $config in validate_referer (Patch by wjvriend)
Authorised by: bantu
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
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 Tue Aug 4 11:04:54 2009
***************
*** 186,191 ****
--- 186,192 ----
<li>[Fix] Do not try to create thumbnails for images we cannot open properly. (Bug #48695)</li>
<li>[Fix] Apply locale-independent basename() to attachment filenames. New function added: utf8_basename(). (Bug #43335 - Patch by ocean=Yohsuke)</li>
<li>[Fix] Adjust build_url() to not prepend $phpbb_root_path if path returned from redirect() is an URL. This fixes redirect issues with some installations and bridges. (Bug #47535)</li>
+ <li>[Fix] Fix general error while registration, through undefined variable $config in validate_referer (Bug #49035 - Patch by wjvriend)</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
<li>[Change] Template engine now permits to a limited extent variable includes.</li>
Modified: branches/phpBB-3_0_0/phpBB/includes/session.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/session.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/session.php Tue Aug 4 11:04:54 2009
***************
*** 1364,1369 ****
--- 1364,1371 ----
*/
function validate_referer($check_script_path = false)
{
+ global $config;
+
// no referer - nothing to validate, user's fault for turning it off (we only check on POST; so meta can't be the reason)
if (empty($this->referer) || empty($this->host))
{
***************
*** 1373,1379 ****
$host = htmlspecialchars($this->host);
$ref = substr($this->referer, strpos($this->referer, '://') + 3);
! if (!(stripos($ref, $host) === 0) && (!$config['force_server'] || !(stripos($ref, $config['server_name']) === 0)))
{
return false;
}
--- 1375,1381 ----
$host = htmlspecialchars($this->host);
$ref = substr($this->referer, strpos($this->referer, '://') + 3);
! if (!(stripos($ref, $host) === 0) && (!$config['force_server_vars'] || !(stripos($ref, $config['server_name']) === 0)))
{
return false;
}
|
|
From: Henry S. <kel...@ph...> - 2009-08-03 15:47:40
|
Author: Kellanved
Date: Mon Aug 3 16:46:56 2009
New Revision: 9916
Log:
#48985
Modified:
branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/acp/acp_profile.php
branches/phpBB-3_0_0/phpBB/install/database_update.php
branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql (contents, props changed)
branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql (contents, props changed)
branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql (contents, props changed)
branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql (contents, props changed)
branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql (contents, props changed)
branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql (contents, props changed)
branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql (contents, props changed)
branches/phpBB-3_0_0/phpBB/language/en/acp/profile.php
branches/phpBB-3_0_0/phpBB/viewtopic.php
Modified: branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php (original)
--- branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php Mon Aug 3 16:46:56 2009
***************
*** 1408,1413 ****
--- 1408,1414 ----
'field_validation' => array('VCHAR_UNI:20', ''),
'field_required' => array('BOOL', 0),
'field_show_on_reg' => array('BOOL', 0),
+ 'field_show_on_vt' => array('BOOL', 0),
'field_show_profile' => array('BOOL', 0),
'field_hide' => array('BOOL', 0),
'field_no_view' => array('BOOL', 0),
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 3 16:46:56 2009
***************
*** 258,266 ****
</li>
<li>[Feature] Display version check on ACP main page.</li>
<li>[Feature] Ability to copy permissions from one forum to several other forums.</li>
<li>[Feature] Fallback options for missing language files. (Bug #38575 - Patch by EXreaction)</li>
</ul>
-
<a name="v304"></a><h3>1.ii. Changes since 3.0.4</h3>
<ul>
--- 258,266 ----
</li>
<li>[Feature] Display version check on ACP main page.</li>
<li>[Feature] Ability to copy permissions from one forum to several other forums.</li>
+ <li>[Feature] Ability to control the display of custom profile fields on viewtopic (Bug #48985).</li>
<li>[Feature] Fallback options for missing language files. (Bug #38575 - Patch by EXreaction)</li>
</ul>
<a name="v304"></a><h3>1.ii. Changes since 3.0.4</h3>
<ul>
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_profile.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_profile.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_profile.php Mon Aug 3 16:46:56 2009
***************
*** 369,374 ****
--- 369,375 ----
'field_show_profile'=> 0,
'field_no_view' => 0,
'field_show_on_reg' => 0,
+ 'field_show_on_vt' => 0,
'lang_name' => utf8_normalize_nfc(request_var('field_ident', '', true)),
'lang_explain' => '',
'lang_default_value'=> '')
***************
*** 379,385 ****
// $exclude contains the data we gather in each step
$exclude = array(
! 1 => array('field_ident', 'lang_name', 'lang_explain', 'field_option_none', 'field_show_on_reg', 'field_required', 'field_hide', 'field_show_profile', 'field_no_view'),
2 => array('field_length', 'field_maxlen', 'field_minlen', 'field_validation', 'field_novalue', 'field_default_value'),
3 => array('l_lang_name', 'l_lang_explain', 'l_lang_default_value', 'l_lang_options')
);
--- 380,386 ----
// $exclude contains the data we gather in each step
$exclude = array(
! 1 => array('field_ident', 'lang_name', 'lang_explain', 'field_option_none', 'field_show_on_reg', 'field_show_on_vt', 'field_required', 'field_hide', 'field_show_profile', 'field_no_view'),
2 => array('field_length', 'field_maxlen', 'field_minlen', 'field_validation', 'field_novalue', 'field_default_value'),
3 => array('l_lang_name', 'l_lang_explain', 'l_lang_default_value', 'l_lang_options')
);
***************
*** 405,410 ****
--- 406,412 ----
$visibility_ary = array(
'field_required',
'field_show_on_reg',
+ 'field_show_on_vt',
'field_show_profile',
'field_hide',
);
***************
*** 721,726 ****
--- 723,729 ----
'S_STEP_ONE' => true,
'S_FIELD_REQUIRED' => ($cp->vars['field_required']) ? true : false,
'S_SHOW_ON_REG' => ($cp->vars['field_show_on_reg']) ? true : false,
+ 'S_SHOW_ON_VT' => ($cp->vars['field_show_on_vt']) ? true : false,
'S_FIELD_HIDE' => ($cp->vars['field_hide']) ? true : false,
'S_SHOW_PROFILE' => ($cp->vars['field_show_profile']) ? true : false,
'S_FIELD_NO_VIEW' => ($cp->vars['field_no_view']) ? true : false,
***************
*** 1036,1041 ****
--- 1039,1045 ----
'field_validation' => $cp->vars['field_validation'],
'field_required' => $cp->vars['field_required'],
'field_show_on_reg' => $cp->vars['field_show_on_reg'],
+ 'field_show_on_vt' => $cp->vars['field_show_on_vt'],
'field_hide' => $cp->vars['field_hide'],
'field_show_profile' => $cp->vars['field_show_profile'],
'field_no_view' => $cp->vars['field_no_view']
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 Mon Aug 3 16:46:56 2009
***************
*** 704,709 ****
--- 704,712 ----
REPORTS_TABLE => array(
'pm_id' => array('UINT', 0),
),
+ PROFILE_FIELDS_TABLE => array(
+ 'field_show_on_vt' => array('BOOL', 0),
+ ),
),
'change_columns' => array(
USERS_TABLE => array(
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql Mon Aug 3 16:46:56 2009
***************
*** 790,795 ****
--- 790,796 ----
field_validation VARCHAR(20) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
field_required INTEGER DEFAULT 0 NOT NULL,
field_show_on_reg INTEGER DEFAULT 0 NOT NULL,
+ field_show_on_vt INTEGER DEFAULT 0 NOT NULL,
field_show_profile INTEGER DEFAULT 0 NOT NULL,
field_hide INTEGER DEFAULT 0 NOT NULL,
field_no_view INTEGER DEFAULT 0 NOT NULL,
***************
*** 1370,1376 ****
user_actkey VARCHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL,
user_newpasswd VARCHAR(40) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
user_form_salt VARCHAR(32) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
! user_new INTEGER DEFAULT 1 NOT NULL
);;
ALTER TABLE phpbb_users ADD PRIMARY KEY (user_id);;
--- 1371,1379 ----
user_actkey VARCHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL,
user_newpasswd VARCHAR(40) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
user_form_salt VARCHAR(32) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
! user_new INTEGER DEFAULT 1 NOT NULL,
! user_reminded INTEGER DEFAULT 0 NOT NULL,
! user_reminded_time INTEGER DEFAULT 0 NOT NULL
);;
ALTER TABLE phpbb_users ADD PRIMARY KEY (user_id);;
Propchange: branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql
------------------------------------------------------------------------------
*** svn:eol-style (original)
--- svn:eol-style Mon Aug 3 16:46:56 2009
***************
*** 1 ****
! native
--- 1 ----
! LF
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql Mon Aug 3 16:46:56 2009
***************
*** 948,953 ****
--- 948,954 ----
[field_validation] [varchar] (20) DEFAULT ('') NOT NULL ,
[field_required] [int] DEFAULT (0) NOT NULL ,
[field_show_on_reg] [int] DEFAULT (0) NOT NULL ,
+ [field_show_on_vt] [int] DEFAULT (0) NOT NULL ,
[field_show_profile] [int] DEFAULT (0) NOT NULL ,
[field_hide] [int] DEFAULT (0) NOT NULL ,
[field_no_view] [int] DEFAULT (0) NOT NULL ,
***************
*** 1645,1651 ****
[user_actkey] [varchar] (32) DEFAULT ('') NOT NULL ,
[user_newpasswd] [varchar] (40) DEFAULT ('') NOT NULL ,
[user_form_salt] [varchar] (32) DEFAULT ('') NOT NULL ,
! [user_new] [int] DEFAULT (1) NOT NULL
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
GO
--- 1646,1654 ----
[user_actkey] [varchar] (32) DEFAULT ('') NOT NULL ,
[user_newpasswd] [varchar] (40) DEFAULT ('') NOT NULL ,
[user_form_salt] [varchar] (32) DEFAULT ('') NOT NULL ,
! [user_new] [int] DEFAULT (1) NOT NULL ,
! [user_reminded] [int] DEFAULT (0) NOT NULL ,
! [user_reminded_time] [int] DEFAULT (0) NOT NULL
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
GO
Propchange: branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql
------------------------------------------------------------------------------
*** svn:eol-style (original)
--- svn:eol-style Mon Aug 3 16:46:56 2009
***************
*** 1 ****
! native
--- 1 ----
! LF
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql Mon Aug 3 16:46:56 2009
***************
*** 554,559 ****
--- 554,560 ----
field_validation varbinary(60) DEFAULT '' NOT NULL,
field_required tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
field_show_on_reg tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+ field_show_on_vt tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
field_show_profile tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
field_hide tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
field_no_view tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
***************
*** 971,976 ****
--- 972,979 ----
user_newpasswd varbinary(120) DEFAULT '' NOT NULL,
user_form_salt varbinary(96) DEFAULT '' NOT NULL,
user_new tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
+ user_reminded tinyint(4) DEFAULT '0' NOT NULL,
+ user_reminded_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
PRIMARY KEY (user_id),
KEY user_birthday (user_birthday),
KEY user_email_hash (user_email_hash),
Propchange: branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql
------------------------------------------------------------------------------
*** svn:eol-style (original)
--- svn:eol-style Mon Aug 3 16:46:56 2009
***************
*** 1 ****
! native
--- 1 ----
! LF
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql Mon Aug 3 16:46:56 2009
***************
*** 554,559 ****
--- 554,560 ----
field_validation varchar(20) DEFAULT '' NOT NULL,
field_required tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
field_show_on_reg tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+ field_show_on_vt tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
field_show_profile tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
field_hide tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
field_no_view tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
***************
*** 971,976 ****
--- 972,979 ----
user_newpasswd varchar(40) DEFAULT '' NOT NULL,
user_form_salt varchar(32) DEFAULT '' NOT NULL,
user_new tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
+ user_reminded tinyint(4) DEFAULT '0' NOT NULL,
+ user_reminded_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
PRIMARY KEY (user_id),
KEY user_birthday (user_birthday),
KEY user_email_hash (user_email_hash),
Propchange: branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql
------------------------------------------------------------------------------
*** svn:eol-style (original)
--- svn:eol-style Mon Aug 3 16:46:56 2009
***************
*** 1 ****
! native
--- 1 ----
! LF
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql Mon Aug 3 16:46:56 2009
***************
*** 1060,1065 ****
--- 1060,1066 ----
field_validation varchar2(60) DEFAULT '' ,
field_required number(1) DEFAULT '0' NOT NULL,
field_show_on_reg number(1) DEFAULT '0' NOT NULL,
+ field_show_on_vt number(1) DEFAULT '0' NOT NULL,
field_show_profile number(1) DEFAULT '0' NOT NULL,
field_hide number(1) DEFAULT '0' NOT NULL,
field_no_view number(1) DEFAULT '0' NOT NULL,
***************
*** 1791,1796 ****
--- 1792,1799 ----
user_newpasswd varchar2(120) DEFAULT '' ,
user_form_salt varchar2(96) DEFAULT '' ,
user_new number(1) DEFAULT '1' NOT NULL,
+ user_reminded number(4) DEFAULT '0' NOT NULL,
+ user_reminded_time number(11) DEFAULT '0' NOT NULL,
CONSTRAINT pk_phpbb_users PRIMARY KEY (user_id),
CONSTRAINT u_phpbb_username_clean UNIQUE (username_clean)
)
Propchange: branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql
------------------------------------------------------------------------------
*** svn:eol-style (original)
--- svn:eol-style Mon Aug 3 16:46:56 2009
***************
*** 1 ****
! native
--- 1 ----
! LF
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql Mon Aug 3 16:46:56 2009
***************
*** 741,746 ****
--- 741,747 ----
field_validation varchar(20) DEFAULT '' NOT NULL,
field_required INT2 DEFAULT '0' NOT NULL CHECK (field_required >= 0),
field_show_on_reg INT2 DEFAULT '0' NOT NULL CHECK (field_show_on_reg >= 0),
+ field_show_on_vt INT2 DEFAULT '0' NOT NULL CHECK (field_show_on_vt >= 0),
field_show_profile INT2 DEFAULT '0' NOT NULL CHECK (field_show_profile >= 0),
field_hide INT2 DEFAULT '0' NOT NULL CHECK (field_hide >= 0),
field_no_view INT2 DEFAULT '0' NOT NULL CHECK (field_no_view >= 0),
***************
*** 1234,1239 ****
--- 1235,1242 ----
user_newpasswd varchar(40) DEFAULT '' NOT NULL,
user_form_salt varchar(32) DEFAULT '' NOT NULL,
user_new INT2 DEFAULT '1' NOT NULL CHECK (user_new >= 0),
+ user_reminded INT2 DEFAULT '0' NOT NULL,
+ user_reminded_time INT4 DEFAULT '0' NOT NULL CHECK (user_reminded_time >= 0),
PRIMARY KEY (user_id)
);
Propchange: branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql
------------------------------------------------------------------------------
*** svn:eol-style (original)
--- svn:eol-style Mon Aug 3 16:46:56 2009
***************
*** 1 ****
! native
--- 1 ----
! LF
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql Mon Aug 3 16:46:56 2009
***************
*** 537,542 ****
--- 537,543 ----
field_validation varchar(20) NOT NULL DEFAULT '',
field_required INTEGER UNSIGNED NOT NULL DEFAULT '0',
field_show_on_reg INTEGER UNSIGNED NOT NULL DEFAULT '0',
+ field_show_on_vt INTEGER UNSIGNED NOT NULL DEFAULT '0',
field_show_profile INTEGER UNSIGNED NOT NULL DEFAULT '0',
field_hide INTEGER UNSIGNED NOT NULL DEFAULT '0',
field_no_view INTEGER UNSIGNED NOT NULL DEFAULT '0',
***************
*** 940,946 ****
user_actkey varchar(32) NOT NULL DEFAULT '',
user_newpasswd varchar(40) NOT NULL DEFAULT '',
user_form_salt varchar(32) NOT NULL DEFAULT '',
! user_new INTEGER UNSIGNED NOT NULL DEFAULT '1'
);
CREATE INDEX phpbb_users_user_birthday ON phpbb_users (user_birthday);
--- 941,949 ----
user_actkey varchar(32) NOT NULL DEFAULT '',
user_newpasswd varchar(40) NOT NULL DEFAULT '',
user_form_salt varchar(32) NOT NULL DEFAULT '',
! user_new INTEGER UNSIGNED NOT NULL DEFAULT '1',
! user_reminded tinyint(4) NOT NULL DEFAULT '0',
! user_reminded_time INTEGER UNSIGNED NOT NULL DEFAULT '0'
);
CREATE INDEX phpbb_users_user_birthday ON phpbb_users (user_birthday);
Propchange: branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql
------------------------------------------------------------------------------
*** svn:eol-style (original)
--- svn:eol-style Mon Aug 3 16:46:56 2009
***************
*** 1 ****
! native
--- 1 ----
! LF
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/profile.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/profile.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/profile.php Mon Aug 3 16:46:56 2009
***************
*** 66,71 ****
--- 66,73 ----
'DISPLAY_AT_PROFILE_EXPLAIN' => 'The user is able to change this profile field within the user control panel.',
'DISPLAY_AT_REGISTER' => 'Display on registration screen',
'DISPLAY_AT_REGISTER_EXPLAIN' => 'If this option is enabled, the field will be displayed on registration.',
+ 'DISPLAY_ON_VT' => 'Display on viewtopic screen',
+ 'DISPLAY_ON_VT_EXPLAIN' => 'If this option is enabled, the field will be displayed in the mini-profile on the topic screen.',
'DISPLAY_PROFILE_FIELD' => 'Publicly display profile field',
'DISPLAY_PROFILE_FIELD_EXPLAIN' => 'The profile field will be shown in all locations allowed within the load settings. Setting this to ânoâ will hide the field from topic pages, profiles and the memberlist.',
'DROPDOWN_ENTRIES_EXPLAIN' => 'Enter your options now, every option in one line.',
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 Mon Aug 3 16:46:56 2009
***************
*** 1179,1185 ****
$cp = new custom_profile();
// Grab all profile fields from users in id cache for later use - similar to the poster cache
! $profile_fields_cache = $cp->generate_profile_fields_template('grab', $id_cache);
}
// Generate online information for user
--- 1179,1200 ----
$cp = new custom_profile();
// Grab all profile fields from users in id cache for later use - similar to the poster cache
! $profile_fields_tmp = $cp->generate_profile_fields_template('grab', $id_cache);
!
! // filter out fields not to be displayed on viewtopic. Yes, it's a hack, but this shouldn't break any MODs.
! $profile_fields_cache = array();
! foreach ($profile_fields_tmp as $profile_user_id => $profile_fields)
! {
! $profile_fields_cache[$profile_user_id] = array();
! foreach ($profile_fields as $used_ident => $profile_field)
! {
! if ($profile_field['data']['field_show_on_vt'])
! {
! $profile_fields_cache[$profile_user_id][$used_ident] = $profile_field;
! }
! }
! }
! unset($profile_fields_tmp);
}
// Generate online information for user
|
|
From: Henry S. <kel...@ph...> - 2009-08-03 13:50:23
|
Author: Kellanved
Date: Mon Aug 3 14:32:52 2009
New Revision: 9915
Log:
require link hash for switchperm
Modified:
branches/phpBB-3_0_0/phpBB/memberlist.php
branches/phpBB-3_0_0/phpBB/ucp.php
Modified: branches/phpBB-3_0_0/phpBB/memberlist.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/memberlist.php (original)
--- branches/phpBB-3_0_0/phpBB/memberlist.php Mon Aug 3 14:32:52 2009
***************
*** 580,586 ****
'U_USER_BAN' => ($auth->acl_get('m_ban') && $user_id != $user->data['user_id']) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=ban&mode=user&u=' . $user_id, true, $user->session_id) : '',
'U_MCP_QUEUE' => ($auth->acl_getf_global('m_approve')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue', true, $user->session_id) : '',
! 'U_SWITCH_PERMISSIONS' => ($auth->acl_get('a_switchperm') && $user->data['user_id'] != $user_id) ? append_sid("{$phpbb_root_path}ucp.$phpEx", "mode=switch_perm&u={$user_id}") : '',
'S_USER_NOTES' => ($user_notes_enabled) ? true : false,
'S_WARN_USER' => ($warn_user_enabled) ? true : false,
--- 580,586 ----
'U_USER_BAN' => ($auth->acl_get('m_ban') && $user_id != $user->data['user_id']) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=ban&mode=user&u=' . $user_id, true, $user->session_id) : '',
'U_MCP_QUEUE' => ($auth->acl_getf_global('m_approve')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue', true, $user->session_id) : '',
! 'U_SWITCH_PERMISSIONS' => ($auth->acl_get('a_switchperm') && $user->data['user_id'] != $user_id) ? append_sid("{$phpbb_root_path}ucp.$phpEx", "mode=switch_perm&u={$user_id}&hash=" . generate_link_hash('switchperm')) : '',
'S_USER_NOTES' => ($user_notes_enabled) ? true : false,
'S_WARN_USER' => ($warn_user_enabled) ? true : false,
Modified: branches/phpBB-3_0_0/phpBB/ucp.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/ucp.php (original)
--- branches/phpBB-3_0_0/phpBB/ucp.php Mon Aug 3 14:32:52 2009
***************
*** 186,192 ****
$user_row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
! if (!$auth->acl_get('a_switchperm') || !$user_row || $user_id == $user->data['user_id'])
{
redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
}
--- 186,192 ----
$user_row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
! if (!$auth->acl_get('a_switchperm') || !$user_row || $user_id == $user->data['user_id'] || !check_link_hash(request_var('hash', ''), 'switchperm'))
{
redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
}
|
|
From: Marek R. <ap...@ph...> - 2009-08-02 16:45:30
|
Author: aptx
Date: Sun Aug 2 17:44:45 2009
New Revision: 9914
Log:
#48965
Modified:
branches/phpBB-3_0_0/phpBB/includes/message_parser.php
Modified: branches/phpBB-3_0_0/phpBB/includes/message_parser.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/message_parser.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/message_parser.php Sun Aug 2 17:44:45 2009
***************
*** 1317,1323 ****
}
// (assertion)
! $match[] = '(?<=^|[\n .])' . preg_quote($row['code'], '#') . '(?![^<>]*>)';
$replace[] = '<!-- s' . $row['code'] . ' --><img src="{SMILIES_PATH}/' . $row['smiley_url'] . '" alt="' . $row['code'] . '" title="' . $row['emotion'] . '" /><!-- s' . $row['code'] . ' -->';
}
$db->sql_freeresult($result);
--- 1317,1323 ----
}
// (assertion)
! $match[] = preg_quote($row['code'], '#');
$replace[] = '<!-- s' . $row['code'] . ' --><img src="{SMILIES_PATH}/' . $row['smiley_url'] . '" alt="' . $row['code'] . '" title="' . $row['emotion'] . '" /><!-- s' . $row['code'] . ' -->';
}
$db->sql_freeresult($result);
***************
*** 1327,1333 ****
{
if ($max_smilies)
{
! $num_matches = preg_match_all('#' . implode('|', $match) . '#', $this->message, $matches);
unset($matches);
if ($num_matches !== false && $num_matches > $max_smilies)
--- 1327,1333 ----
{
if ($max_smilies)
{
! $num_matches = preg_match_all('#(?<=^|[\n .])(?:' . implode('|', $match) . ')(?![^<>]*>)#', $this->message, $matches);
unset($matches);
if ($num_matches !== false && $num_matches > $max_smilies)
***************
*** 1338,1344 ****
}
// Make sure the delimiter # is added in front and at the end of every element within $match
! $this->message = trim(preg_replace(explode(chr(0), '#' . implode('#' . chr(0) . '#', $match) . '#'), $replace, $this->message));
}
}
--- 1338,1344 ----
}
// Make sure the delimiter # is added in front and at the end of every element within $match
! $this->message = trim(preg_replace(explode(chr(0), '#(?<=^|[\n .])' . implode('(?![^<>]*>)#' . chr(0) . '#(?<=^|[\n .])', $match) . '(?![^<>]*>)#'), $replace, $this->message));
}
}
|
|
From: Henry S. <kel...@ph...> - 2009-08-02 11:36:33
|
Author: Kellanved
Date: Sun Aug 2 12:35:42 2009
New Revision: 9913
Log:
switch to full editor
Modified:
branches/phpBB-3_0_0/phpBB/language/en/viewtopic.php
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/quickreply_editor.html
Modified: branches/phpBB-3_0_0/phpBB/language/en/viewtopic.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/viewtopic.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/viewtopic.php Sun Aug 2 12:35:42 2009
***************
*** 59,65 ****
'FILE_NOT_FOUND_404' => 'The file <strong>%s</strong> does not exist.',
'FORK_TOPIC' => 'Copy topic',
!
'LINKAGE_FORBIDDEN' => 'You are not authorised to view, download or link from/to this site.',
'LOGIN_NOTIFY_TOPIC' => 'You have been notified about this topic, please login to view it.',
'LOGIN_VIEWTOPIC' => 'The board requires you to be registered and logged in to view this topic.',
--- 59,66 ----
'FILE_NOT_FOUND_404' => 'The file <strong>%s</strong> does not exist.',
'FORK_TOPIC' => 'Copy topic',
! 'FULL_EDITOR' => 'Full Editor',
!
'LINKAGE_FORBIDDEN' => 'You are not authorised to view, download or link from/to this site.',
'LOGIN_NOTIFY_TOPIC' => 'You have been notified about this topic, please login to view it.',
'LOGIN_VIEWTOPIC' => 'The board requires you to be registered and logged in to view this topic.',
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html Sun Aug 2 12:35:42 2009
***************
*** 28,33 ****
--- 28,34 ----
{S_FORM_TOKEN}
{QR_HIDDEN_FIELDS}
<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />
+ <input type="submit" accesskey="f" tabindex="6" name="preview" value="{L_FULL_EDITOR}" class="button2" />
</fieldset>
</div>
<span class="corners-bottom"><span></span></span></div>
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/quickreply_editor.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/quickreply_editor.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/quickreply_editor.html Sun Aug 2 12:35:42 2009
***************
*** 10,19 ****
</tr>
<tr>
<td class="row1" width="22%"><b class="genmed">{L_MESSAGE}:</b></td>
! <td class="row2 valign="top" align="center" width="78%"><textarea name="message" rows="7" cols="76" tabindex="3" style="width: 98%;"></textarea> </td></tr>
<tr>
<td class="cat" colspan="2" align="center">
! <input class="btnmain" type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" />
{S_FORM_TOKEN}
{QR_HIDDEN_FIELDS}
</td>
--- 10,22 ----
</tr>
<tr>
<td class="row1" width="22%"><b class="genmed">{L_MESSAGE}:</b></td>
! <td class="row2" valign="top" align="left" width="78%"><textarea name="message" rows="7" cols="76" tabindex="3" style="width: 98%;"></textarea> </td>
! </tr>
<tr>
<td class="cat" colspan="2" align="center">
! <input class="btnmain" type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" />
! <input class="btnlite" type="submit" accesskey="f" tabindex="7" name="preview" value="{L_FULL_EDITOR}" />
!
{S_FORM_TOKEN}
{QR_HIDDEN_FIELDS}
</td>
|
|
From: Yuriy R. <mar...@ph...> - 2009-08-01 21:15:21
|
Author: marshalrusty
Date: Sat Aug 1 22:14:33 2009
New Revision: 9912
Log:
Language changes
Modified:
branches/phpBB-3_0_0/phpBB/language/en/captcha_recaptcha.php
Modified: branches/phpBB-3_0_0/phpBB/language/en/captcha_recaptcha.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/captcha_recaptcha.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/captcha_recaptcha.php Sat Aug 1 22:14:33 2009
***************
*** 37,52 ****
$lang = array_merge($lang, array(
'RECAPTCHA_LANG' => 'en',
! 'RECAPTCHA_NOT_AVAILABLE' => 'You have to register for reCaptcha at <a href="http://recaptcha.net">reCaptcha.net</a>.',
'CAPTCHA_RECAPTCHA' => 'reCaptcha',
! 'RECAPTCHA_INCORRECT' => 'The entered visual confirmation was incorrect',
'RECAPTCHA_PUBLIC' => 'Public reCaptcha key',
! 'RECAPTCHA_PUBLIC_EXPLAIN' => 'Your public reCaptcha key. You can obtain keys from <a href="http://recaptcha.net">reCaptcha.net</a>.',
'RECAPTCHA_PRIVATE' => 'Private reCaptcha key',
! 'RECAPTCHA_PRIVATE_EXPLAIN' => 'Your private reCaptcha key. You can obtain keys from <a href="http://recaptcha.net">reCaptcha.net</a>.',
! 'RECAPTCHA_EXPLAIN' => 'To avoid spam postings, please enter the two words shown in the picture into the text field underneath.',
));
?>
\ No newline at end of file
--- 37,52 ----
$lang = array_merge($lang, array(
'RECAPTCHA_LANG' => 'en',
! 'RECAPTCHA_NOT_AVAILABLE' => 'In order to use reCaptcha, you must create an account on <a href="http://recaptcha.net">reCaptcha.net</a>.',
'CAPTCHA_RECAPTCHA' => 'reCaptcha',
! 'RECAPTCHA_INCORRECT' => 'The visual confirmation code you submitted was incorrect',
'RECAPTCHA_PUBLIC' => 'Public reCaptcha key',
! 'RECAPTCHA_PUBLIC_EXPLAIN' => 'Your public reCaptcha key. Keys can be obtained on <a href="http://recaptcha.net">reCaptcha.net</a>.',
'RECAPTCHA_PRIVATE' => 'Private reCaptcha key',
! 'RECAPTCHA_PRIVATE_EXPLAIN' => 'Your private reCaptcha key. Keys can be obtained on <a href="http://recaptcha.net">reCaptcha.net</a>.',
! 'RECAPTCHA_EXPLAIN' => 'Please enter both of the words displayed below into the text field underneath. This is a measure taken to prevent spam.',
));
?>
\ No newline at end of file
|
|
From: Meik S. <acy...@ph...> - 2009-08-01 17:10:33
|
Author: acydburn
Date: Sat Aug 1 18:09:43 2009
New Revision: 9911
Log:
forgot this in r9909
Modified:
branches/phpBB-3_0_0/phpBB/includes/db/dbal.php
Modified: branches/phpBB-3_0_0/phpBB/includes/db/dbal.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/db/dbal.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/db/dbal.php Sat Aug 1 18:09:43 2009
***************
*** 435,442 ****
// If by accident the sql array is only one-dimensional we build a normal insert statement
if (!is_array($_sql_ary))
{
! $this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('INSERT', $sql_ary));
! return true;
}
$values = array();
--- 435,441 ----
// If by accident the sql array is only one-dimensional we build a normal insert statement
if (!is_array($_sql_ary))
{
! return $this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('INSERT', $sql_ary));
}
$values = array();
|
|
From: Ruslan U. <rx...@ph...> - 2009-08-01 16:28:19
|
Author: rxu
Date: Sat Aug 1 17:28:02 2009
New Revision: 9910
Log:
Fix bug #1309 - Multiline [url] not Converted
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/message_parser.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Sat Aug 1 17:28:02 2009
***************
*** 209,214 ****
--- 209,215 ----
<li>[Change] Cache get_username_string() function calls on viewtopic.</li>
<li>[Change] Cache version check.</li>
<li>[Change] When creating a new forum without copying permissions, ask again.</li>
+ <li>[Change] Parse multiline url title for [url] BBCode tag. (Bug #1309)</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>
Modified: branches/phpBB-3_0_0/phpBB/includes/message_parser.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/message_parser.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/message_parser.php Sat Aug 1 17:28:02 2009
***************
*** 115,121 ****
'attachment' => array('bbcode_id' => 12, 'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#ise' => "\$this->bbcode_attachment('\$1', '\$2')")),
'b' => array('bbcode_id' => 1, 'regexp' => array('#\[b\](.*?)\[/b\]#ise' => "\$this->bbcode_strong('\$1')")),
'i' => array('bbcode_id' => 2, 'regexp' => array('#\[i\](.*?)\[/i\]#ise' => "\$this->bbcode_italic('\$1')")),
! 'url' => array('bbcode_id' => 3, 'regexp' => array('#\[url(=(.*))?\](.*)\[/url\]#iUe' => "\$this->validate_url('\$2', '\$3')")),
'img' => array('bbcode_id' => 4, 'regexp' => array('#\[img\](.*)\[/img\]#iUe' => "\$this->bbcode_img('\$1')")),
'size' => array('bbcode_id' => 5, 'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#ise' => "\$this->bbcode_size('\$1', '\$2')")),
'color' => array('bbcode_id' => 6, 'regexp' => array('!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!ise' => "\$this->bbcode_color('\$1', '\$2')")),
--- 115,121 ----
'attachment' => array('bbcode_id' => 12, 'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#ise' => "\$this->bbcode_attachment('\$1', '\$2')")),
'b' => array('bbcode_id' => 1, 'regexp' => array('#\[b\](.*?)\[/b\]#ise' => "\$this->bbcode_strong('\$1')")),
'i' => array('bbcode_id' => 2, 'regexp' => array('#\[i\](.*?)\[/i\]#ise' => "\$this->bbcode_italic('\$1')")),
! 'url' => array('bbcode_id' => 3, 'regexp' => array('#\[url(=(.*))?\]((?s).*)\[/url\]#iUe' => "\$this->validate_url('\$2', '\$3')")),
'img' => array('bbcode_id' => 4, 'regexp' => array('#\[img\](.*)\[/img\]#iUe' => "\$this->bbcode_img('\$1')")),
'size' => array('bbcode_id' => 5, 'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#ise' => "\$this->bbcode_size('\$1', '\$2')")),
'color' => array('bbcode_id' => 6, 'regexp' => array('!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!ise' => "\$this->bbcode_color('\$1', '\$2')")),
|
|
From: Meik S. <acy...@ph...> - 2009-08-01 16:08:24
|
Author: acydburn
Date: Sat Aug 1 17:08:05 2009
New Revision: 9909
Log:
return errors if return_on_error is true for multi_insert (Patch by bantu)
Modified:
branches/phpBB-3_0_0/phpBB/includes/db/dbal.php
Modified: branches/phpBB-3_0_0/phpBB/includes/db/dbal.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/db/dbal.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/db/dbal.php Sat Aug 1 17:08:05 2009
***************
*** 447,453 ****
$ary[] = '(' . implode(', ', $values) . ')';
}
! $this->sql_query('INSERT INTO ' . $table . ' ' . ' (' . implode(', ', array_keys($sql_ary[0])) . ') VALUES ' . implode(', ', $ary));
}
else
{
--- 447,453 ----
$ary[] = '(' . implode(', ', $values) . ')';
}
! return $this->sql_query('INSERT INTO ' . $table . ' ' . ' (' . implode(', ', array_keys($sql_ary[0])) . ') VALUES ' . implode(', ', $ary));
}
else
{
***************
*** 458,464 ****
return false;
}
! $this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('INSERT', $ary));
}
}
--- 458,469 ----
return false;
}
! $result = $this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('INSERT', $ary));
!
! if (!$result)
! {
! return false;
! }
}
}
|
|
From: Andreas F. <ba...@ph...> - 2009-08-01 15:47:06
|
Author: bantu
Date: Sat Aug 1 16:46:23 2009
New Revision: 9908
Log:
Tiny adjustments related to r9900 and r9897.
Modified:
branches/phpBB-3_0_0/phpBB/docs/AUTHORS
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
Modified: branches/phpBB-3_0_0/phpBB/docs/AUTHORS
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/AUTHORS (original)
--- branches/phpBB-3_0_0/phpBB/docs/AUTHORS Sat Aug 1 16:46:23 2009
***************
*** 23,29 ****
phpBB Lead Developer : Acyd Burn (Meik Sievertsen)
phpBB Developers : APTX (Marek A. R.)
! Bantu (Andreas Fischer)
DavidMJ (David M.)
dhn (Dominik Dröscher)
kellanved (Henry Sudhof)
--- 23,29 ----
phpBB Lead Developer : Acyd Burn (Meik Sievertsen)
phpBB Developers : APTX (Marek A. R.)
! bantu (Andreas Fischer)
DavidMJ (David M.)
dhn (Dominik Dröscher)
kellanved (Henry Sudhof)
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Sat Aug 1 16:46:23 2009
***************
*** 208,214 ****
<li>[Change] Add pagination for icons and smilies in the ACP and smilies in the smiley popup</li>
<li>[Change] Cache get_username_string() function calls on viewtopic.</li>
<li>[Change] Cache version check.</li>
! <li>[Change] When creating a new forum without copying permissions, ask again. </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>
--- 208,214 ----
<li>[Change] Add pagination for icons and smilies in the ACP and smilies in the smiley popup</li>
<li>[Change] Cache get_username_string() function calls on viewtopic.</li>
<li>[Change] Cache version check.</li>
! <li>[Change] When creating a new forum without copying permissions, ask again.</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: Meik S. <acy...@ph...> - 2009-08-01 13:52:57
|
Author: acydburn
Date: Sat Aug 1 14:52:37 2009
New Revision: 9907
Log:
Adjust build_url() to not prepend $phpbb_root_path if path returned from redirect() is an URL. This fixes redirect issues with some installations and bridges. (Bug #47535)
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/functions.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Sat Aug 1 14:52:37 2009
***************
*** 185,190 ****
--- 185,191 ----
<li>[Fix] Correctly log action when users request to join a group (Bug #37585 - Patch by nickvergessen)</li>
<li>[Fix] Do not try to create thumbnails for images we cannot open properly. (Bug #48695)</li>
<li>[Fix] Apply locale-independent basename() to attachment filenames. New function added: utf8_basename(). (Bug #43335 - Patch by ocean=Yohsuke)</li>
+ <li>[Fix] Adjust build_url() to not prepend $phpbb_root_path if path returned from redirect() is an URL. This fixes redirect issues with some installations and bridges. (Bug #47535)</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
<li>[Change] Template engine now permits to a limited extent variable includes.</li>
Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Sat Aug 1 14:52:37 2009
***************
*** 2284,2290 ****
$url = str_replace('&', '&', $url);
// Determine which type of redirect we need to handle...
! $url_parts = parse_url($url);
if ($url_parts === false)
{
--- 2284,2290 ----
$url = str_replace('&', '&', $url);
// Determine which type of redirect we need to handle...
! $url_parts = @parse_url($url);
if ($url_parts === false)
{
***************
*** 2497,2502 ****
--- 2497,2514 ----
$redirect .= ($query) ? '?' . $query : '';
}
+ // We need to be cautious here.
+ // On some situations, the redirect path is an absolute URL, sometimes a relative path
+ // For a relative path, let's prefix it with $phpbb_root_path to point to the correct location,
+ // else we use the URL directly.
+ $url_parts = @parse_url($redirect);
+
+ // URL
+ if ($url_parts !== false && !empty($url_parts['scheme']) && !empty($url_parts['host']))
+ {
+ return str_replace('&', '&', $redirect);
+ }
+
return $phpbb_root_path . str_replace('&', '&', $redirect);
}
***************
*** 3596,3602 ****
exit_handler();
break;
!
// PHP4 comptibility
case E_DEPRECATED:
return true;
--- 3608,3614 ----
exit_handler();
break;
!
// PHP4 comptibility
case E_DEPRECATED:
return true;
|
|
From: Meik S. <acy...@ph...> - 2009-08-01 12:36:21
|
Author: acydburn
Date: Sat Aug 1 13:36:05 2009
New Revision: 9906
Log:
change preferred to recommended in install.html file
Modified:
branches/phpBB-3_0_0/phpBB/docs/INSTALL.html
Modified: branches/phpBB-3_0_0/phpBB/docs/INSTALL.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/INSTALL.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/INSTALL.html Sat Aug 1 13:36:05 2009
***************
*** 283,289 ****
<p>The patch file package is for those wanting to update through the patch application, and being comfortable with it.</p>
! <p>The patch file is one solution for those with many Modifications (MODs) or other changes who do not want to re-add them back to all the changed files if they use the method explained above. To use this you will need command line access to a standard UNIX type <strong>patch</strong> application. If you do not have access to such an application but still want to use this update approach, we strongly recommend the <a href="#update_auto">Automatic update package</a> explained below. It is also the preferred update method.</p>
<p>A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is 3.0.4 you need the phpBB-3.0.4_to_3.0.5.patch file. Place the correct patch in the parent directory containing the phpBB3 core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: <strong>patch -cl -d [PHPBB DIRECTORY] -p1 < [PATCH NAME]</strong> (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB3, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.</p>
--- 283,289 ----
<p>The patch file package is for those wanting to update through the patch application, and being comfortable with it.</p>
! <p>The patch file is one solution for those with many Modifications (MODs) or other changes who do not want to re-add them back to all the changed files if they use the method explained above. To use this you will need command line access to a standard UNIX type <strong>patch</strong> application. If you do not have access to such an application but still want to use this update approach, we strongly recommend the <a href="#update_auto">Automatic update package</a> explained below. It is also the recommended update method.</p>
<p>A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is 3.0.4 you need the phpBB-3.0.4_to_3.0.5.patch file. Place the correct patch in the parent directory containing the phpBB3 core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: <strong>patch -cl -d [PHPBB DIRECTORY] -p1 < [PATCH NAME]</strong> (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB3, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.</p>
***************
*** 293,299 ****
<a name="update_auto"></a><h3>4.iv. Automatic update package</h3>
! <p>This update method is the preferred method for updating. This package allows detecting changed files automatically and merges changes if needed.</p>
<p>The automatic update package contains - contrary to the others - only the information required to update the previous release version to the latest available version. These packages are meant for use with the automatic update tool.</p>
--- 293,299 ----
<a name="update_auto"></a><h3>4.iv. Automatic update package</h3>
! <p>This update method is the recommended method for updating. This package allows detecting changed files automatically and merges changes if needed.</p>
<p>The automatic update package contains - contrary to the others - only the information required to update the previous release version to the latest available version. These packages are meant for use with the automatic update tool.</p>
|
|
From: Ruslan U. <rx...@ph...> - 2009-08-01 12:30:33
|
Author: rxu
Date: Sat Aug 1 13:13:16 2009
New Revision: 9904
Log:
Addition to r9899 for bug #48695 - trying to create thumbnail for broken jpeg image
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions_posting.php
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 Sat Aug 1 13:13:16 2009
***************
*** 684,689 ****
--- 684,690 ----
break;
case IMG_JPG:
+ @ini_set('gd.jpeg_ignore_warning', 1);
$image = @imagecreatefromjpeg($source);
break;
|
|
From: Meik S. <acy...@ph...> - 2009-08-01 12:29:12
|
Author: acydburn
Date: Sat Aug 1 13:28:50 2009
New Revision: 9905
Log:
Apply locale-independent basename() to attachment filenames. New function added: utf8_basename(). (Bug #43335 - Patch by ocean=Yohsuke)
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/download/file.php
branches/phpBB-3_0_0/phpBB/includes/acp/acp_attachments.php
branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
branches/phpBB-3_0_0/phpBB/includes/functions_content.php
branches/phpBB-3_0_0/phpBB/includes/functions_convert.php
branches/phpBB-3_0_0/phpBB/includes/functions_posting.php
branches/phpBB-3_0_0/phpBB/includes/functions_privmsgs.php
branches/phpBB-3_0_0/phpBB/includes/functions_upload.php
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_main.php
branches/phpBB-3_0_0/phpBB/includes/utf/utf_tools.php
branches/phpBB-3_0_0/phpBB/viewtopic.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Sat Aug 1 13:28:50 2009
***************
*** 184,189 ****
--- 184,190 ----
<li>[Fix] Min/max characters per posts also affects polls option (Bug #47295 - Patch by nickvergessen)</li>
<li>[Fix] Correctly log action when users request to join a group (Bug #37585 - Patch by nickvergessen)</li>
<li>[Fix] Do not try to create thumbnails for images we cannot open properly. (Bug #48695)</li>
+ <li>[Fix] Apply locale-independent basename() to attachment filenames. New function added: utf8_basename(). (Bug #43335 - Patch by ocean=Yohsuke)</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
<li>[Change] Template engine now permits to a limited extent variable includes.</li>
Modified: branches/phpBB-3_0_0/phpBB/download/file.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/download/file.php (original)
--- branches/phpBB-3_0_0/phpBB/download/file.php Sat Aug 1 13:28:50 2009
***************
*** 249,255 ****
trigger_error('ERROR_NO_ATTACHMENT');
}
! $attachment['physical_filename'] = basename($attachment['physical_filename']);
$display_cat = $extensions[$attachment['extension']]['display_cat'];
if (($display_cat == ATTACHMENT_CATEGORY_IMAGE || $display_cat == ATTACHMENT_CATEGORY_THUMB) && !$user->optionget('viewimg'))
--- 249,255 ----
trigger_error('ERROR_NO_ATTACHMENT');
}
! $attachment['physical_filename'] = utf8_basename($attachment['physical_filename']);
$display_cat = $extensions[$attachment['extension']]['display_cat'];
if (($display_cat == ATTACHMENT_CATEGORY_IMAGE || $display_cat == ATTACHMENT_CATEGORY_THUMB) && !$user->optionget('viewimg'))
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_attachments.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_attachments.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_attachments.php Sat Aug 1 13:28:50 2009
***************
*** 1027,1034 ****
$template->assign_block_vars('orphan', array(
'FILESIZE' => get_formatted_filesize($row['filesize']),
'FILETIME' => $user->format_date($row['filetime']),
! 'REAL_FILENAME' => basename($row['real_filename']),
! 'PHYSICAL_FILENAME' => basename($row['physical_filename']),
'ATTACH_ID' => $row['attach_id'],
'POST_IDS' => (!empty($post_ids[$row['attach_id']])) ? $post_ids[$row['attach_id']] : '',
'U_FILE' => append_sid($phpbb_root_path . 'download/file.' . $phpEx, 'mode=view&id=' . $row['attach_id']))
--- 1027,1034 ----
$template->assign_block_vars('orphan', array(
'FILESIZE' => get_formatted_filesize($row['filesize']),
'FILETIME' => $user->format_date($row['filetime']),
! 'REAL_FILENAME' => utf8_basename($row['real_filename']),
! 'PHYSICAL_FILENAME' => utf8_basename($row['physical_filename']),
'ATTACH_ID' => $row['attach_id'],
'POST_IDS' => (!empty($post_ids[$row['attach_id']])) ? $post_ids[$row['attach_id']] : '',
'U_FILE' => append_sid($phpbb_root_path . 'download/file.' . $phpEx, 'mode=view&id=' . $row['attach_id']))
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_admin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_admin.php Sat Aug 1 13:28:50 2009
***************
*** 1235,1241 ****
// Because of copying topics or modifications a physical filename could be assigned more than once. If so, do not remove the file itself.
$sql = 'SELECT COUNT(attach_id) AS num_entries
FROM ' . ATTACHMENTS_TABLE . "
! WHERE physical_filename = '" . $db->sql_escape(basename($filename)) . "'";
$result = $db->sql_query($sql);
$num_entries = (int) $db->sql_fetchfield('num_entries');
$db->sql_freeresult($result);
--- 1235,1241 ----
// Because of copying topics or modifications a physical filename could be assigned more than once. If so, do not remove the file itself.
$sql = 'SELECT COUNT(attach_id) AS num_entries
FROM ' . ATTACHMENTS_TABLE . "
! WHERE physical_filename = '" . $db->sql_escape(utf8_basename($filename)) . "'";
$result = $db->sql_query($sql);
$num_entries = (int) $db->sql_fetchfield('num_entries');
$db->sql_freeresult($result);
***************
*** 1246,1252 ****
return false;
}
! $filename = ($mode == 'thumbnail') ? 'thumb_' . basename($filename) : basename($filename);
return @unlink($phpbb_root_path . $config['upload_path'] . '/' . $filename);
}
--- 1246,1252 ----
return false;
}
! $filename = ($mode == 'thumbnail') ? 'thumb_' . utf8_basename($filename) : utf8_basename($filename);
return @unlink($phpbb_root_path . $config['upload_path'] . '/' . $filename);
}
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 Sat Aug 1 13:28:50 2009
***************
*** 841,848 ****
// Some basics...
$attachment['extension'] = strtolower(trim($attachment['extension']));
! $filename = $phpbb_root_path . $config['upload_path'] . '/' . basename($attachment['physical_filename']);
! $thumbnail_filename = $phpbb_root_path . $config['upload_path'] . '/thumb_' . basename($attachment['physical_filename']);
$upload_icon = '';
--- 841,848 ----
// Some basics...
$attachment['extension'] = strtolower(trim($attachment['extension']));
! $filename = $phpbb_root_path . $config['upload_path'] . '/' . utf8_basename($attachment['physical_filename']);
! $thumbnail_filename = $phpbb_root_path . $config['upload_path'] . '/thumb_' . utf8_basename($attachment['physical_filename']);
$upload_icon = '';
***************
*** 866,872 ****
'UPLOAD_ICON' => $upload_icon,
'FILESIZE' => $filesize['value'],
'SIZE_LANG' => $filesize['unit'],
! 'DOWNLOAD_NAME' => basename($attachment['real_filename']),
'COMMENT' => $comment,
);
--- 866,872 ----
'UPLOAD_ICON' => $upload_icon,
'FILESIZE' => $filesize['value'],
'SIZE_LANG' => $filesize['unit'],
! 'DOWNLOAD_NAME' => utf8_basename($attachment['real_filename']),
'COMMENT' => $comment,
);
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_convert.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_convert.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_convert.php Sat Aug 1 13:28:50 2009
***************
*** 551,557 ****
);
// copy file will prepend $phpBB_root_path
! $target = $config[$config_var] . '/' . basename(($use_target === false) ? $source : $use_target);
if (!empty($convert->convertor[$config_var]) && strpos($source, $convert->convertor[$config_var]) !== 0)
{
--- 551,557 ----
);
// copy file will prepend $phpBB_root_path
! $target = $config[$config_var] . '/' . utf8_basename(($use_target === false) ? $source : $use_target);
if (!empty($convert->convertor[$config_var]) && strpos($source, $convert->convertor[$config_var]) !== 0)
{
***************
*** 567,577 ****
if ($result['copied'])
{
! $result['target'] = basename($target);
}
else
{
! $result['target'] = ($use_target !== false) ? $result['orig_source'] : basename($target);
}
return $result;
--- 567,577 ----
if ($result['copied'])
{
! $result['target'] = utf8_basename($target);
}
else
{
! $result['target'] = ($use_target !== false) ? $result['orig_source'] : utf8_basename($target);
}
return $result;
***************
*** 600,606 ****
{
$thumb_dir = $convert->convertor['thumbnails'][0];
$thumb_prefix = $convert->convertor['thumbnails'][1];
! $thumb_source = $thumb_dir . $thumb_prefix . basename($result['source']);
if (strpos($thumb_source, $convert->convertor['upload_path']) !== 0)
{
--- 600,606 ----
{
$thumb_dir = $convert->convertor['thumbnails'][0];
$thumb_prefix = $convert->convertor['thumbnails'][1];
! $thumb_source = $thumb_dir . $thumb_prefix . utf8_basename($result['source']);
if (strpos($thumb_source, $convert->convertor['upload_path']) !== 0)
{
***************
*** 2257,2263 ****
if (substr($trg, -1) == '/')
{
! $trg .= basename($src);
}
$src_path = relative_base($src, $source_relative_path, __LINE__, __FILE__);
$trg_path = $trg;
--- 2257,2263 ----
if (substr($trg, -1) == '/')
{
! $trg .= utf8_basename($src);
}
$src_path = relative_base($src, $source_relative_path, __LINE__, __FILE__);
$trg_path = $trg;
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 Sat Aug 1 13:28:50 2009
***************
*** 785,791 ****
foreach ($attachment_data as $i => $attachment)
{
! $s_inline_attachment_options .= '<option value="' . $i . '">' . basename($attachment['real_filename']) . '</option>';
}
$template->assign_var('S_INLINE_ATTACHMENT_OPTIONS', $s_inline_attachment_options);
--- 785,791 ----
foreach ($attachment_data as $i => $attachment)
{
! $s_inline_attachment_options .= '<option value="' . $i . '">' . utf8_basename($attachment['real_filename']) . '</option>';
}
$template->assign_var('S_INLINE_ATTACHMENT_OPTIONS', $s_inline_attachment_options);
***************
*** 819,825 ****
foreach ($attachment_data as $count => $attach_row)
{
$hidden = '';
! $attach_row['real_filename'] = basename($attach_row['real_filename']);
foreach ($attach_row as $key => $value)
{
--- 819,825 ----
foreach ($attachment_data as $count => $attach_row)
{
$hidden = '';
! $attach_row['real_filename'] = utf8_basename($attach_row['real_filename']);
foreach ($attach_row as $key => $value)
{
***************
*** 829,836 ****
$download_link = append_sid("{$phpbb_root_path}download/file.$phpEx", 'mode=view&id=' . (int) $attach_row['attach_id'], true, ($attach_row['is_orphan']) ? $user->session_id : false);
$template->assign_block_vars('attach_row', array(
! 'FILENAME' => basename($attach_row['real_filename']),
! 'A_FILENAME' => addslashes(basename($attach_row['real_filename'])),
'FILE_COMMENT' => $attach_row['attach_comment'],
'ATTACH_ID' => $attach_row['attach_id'],
'S_IS_ORPHAN' => $attach_row['is_orphan'],
--- 829,836 ----
$download_link = append_sid("{$phpbb_root_path}download/file.$phpEx", 'mode=view&id=' . (int) $attach_row['attach_id'], true, ($attach_row['is_orphan']) ? $user->session_id : false);
$template->assign_block_vars('attach_row', array(
! 'FILENAME' => utf8_basename($attach_row['real_filename']),
! 'A_FILENAME' => addslashes(utf8_basename($attach_row['real_filename'])),
'FILE_COMMENT' => $attach_row['attach_comment'],
'ATTACH_ID' => $attach_row['attach_id'],
'S_IS_ORPHAN' => $attach_row['is_orphan'],
***************
*** 2175,2181 ****
else
{
// insert attachment into db
! if (!@file_exists($phpbb_root_path . $config['upload_path'] . '/' . basename($orphan_rows[$attach_row['attach_id']]['physical_filename'])))
{
continue;
}
--- 2175,2181 ----
else
{
// insert attachment into db
! if (!@file_exists($phpbb_root_path . $config['upload_path'] . '/' . utf8_basename($orphan_rows[$attach_row['attach_id']]['physical_filename'])))
{
continue;
}
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_privmsgs.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_privmsgs.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_privmsgs.php Sat Aug 1 13:28:50 2009
***************
*** 1552,1558 ****
else
{
// insert attachment into db
! if (!@file_exists($phpbb_root_path . $config['upload_path'] . '/' . basename($orphan_rows[$attach_row['attach_id']]['physical_filename'])))
{
continue;
}
--- 1552,1558 ----
else
{
// insert attachment into db
! if (!@file_exists($phpbb_root_path . $config['upload_path'] . '/' . utf8_basename($orphan_rows[$attach_row['attach_id']]['physical_filename'])))
{
continue;
}
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_upload.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_upload.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_upload.php Sat Aug 1 13:28:50 2009
***************
*** 58,64 ****
$this->filename = $upload_ary['tmp_name'];
$this->filesize = $upload_ary['size'];
! $name = trim(htmlspecialchars(basename($upload_ary['name'])));
$this->realname = $this->uploadname = (STRIP) ? stripslashes($name) : $name;
$this->mimetype = $upload_ary['type'];
--- 58,64 ----
$this->filename = $upload_ary['tmp_name'];
$this->filesize = $upload_ary['size'];
! $name = trim(utf8_htmlspecialchars(utf8_basename($upload_ary['name'])));
$this->realname = $this->uploadname = (STRIP) ? stripslashes($name) : $name;
$this->mimetype = $upload_ary['type'];
***************
*** 290,296 ****
$upload_mode = (@ini_get('open_basedir') || @ini_get('safe_mode') || strtolower(@ini_get('safe_mode')) == 'on') ? 'move' : 'copy';
$upload_mode = ($this->local) ? 'local' : $upload_mode;
! $this->destination_file = $this->destination_path . '/' . basename($this->realname);
// Check if the file already exist, else there is something wrong...
if (file_exists($this->destination_file) && !$overwrite)
--- 290,296 ----
$upload_mode = (@ini_get('open_basedir') || @ini_get('safe_mode') || strtolower(@ini_get('safe_mode')) == 'on') ? 'move' : 'copy';
$upload_mode = ($this->local) ? 'local' : $upload_mode;
! $this->destination_file = $this->destination_path . '/' . utf8_basename($this->realname);
// Check if the file already exist, else there is something wrong...
if (file_exists($this->destination_file) && !$overwrite)
***************
*** 634,640 ****
if ($filedata === false)
{
! $_FILES[$form_name]['name'] = basename($source_file);
$_FILES[$form_name]['size'] = 0;
$mimetype = '';
--- 634,640 ----
if ($filedata === false)
{
! $_FILES[$form_name]['name'] = utf8_basename($source_file);
$_FILES[$form_name]['size'] = 0;
$mimetype = '';
***************
*** 746,752 ****
$ext = array_pop($url['path']);
$url['path'] = implode('', $url['path']);
! $upload_ary['name'] = basename($url['path']) . (($ext) ? '.' . $ext : '');
$filename = $url['path'];
$filesize = 0;
--- 746,752 ----
$ext = array_pop($url['path']);
$url['path'] = implode('', $url['path']);
! $upload_ary['name'] = utf8_basename($url['path']) . (($ext) ? '.' . $ext : '');
$filename = $url['path'];
$filesize = 0;
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_main.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_main.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_main.php Sat Aug 1 13:28:50 2009
***************
*** 1168,1175 ****
'in_message' => 0,
'is_orphan' => (int) $attach_row['is_orphan'],
'poster_id' => (int) $attach_row['poster_id'],
! 'physical_filename' => (string) basename($attach_row['physical_filename']),
! 'real_filename' => (string) basename($attach_row['real_filename']),
'download_count' => (int) $attach_row['download_count'],
'attach_comment' => (string) $attach_row['attach_comment'],
'extension' => (string) $attach_row['extension'],
--- 1168,1175 ----
'in_message' => 0,
'is_orphan' => (int) $attach_row['is_orphan'],
'poster_id' => (int) $attach_row['poster_id'],
! 'physical_filename' => (string) utf8_basename($attach_row['physical_filename']),
! 'real_filename' => (string) utf8_basename($attach_row['real_filename']),
'download_count' => (int) $attach_row['download_count'],
'attach_comment' => (string) $attach_row['attach_comment'],
'extension' => (string) $attach_row['extension'],
Modified: branches/phpBB-3_0_0/phpBB/includes/utf/utf_tools.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/utf/utf_tools.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/utf/utf_tools.php Sat Aug 1 13:28:50 2009
***************
*** 70,76 ****
$pos = 0;
$len = strlen($str);
$ret = '';
!
while ($pos < $len)
{
$ord = ord($str[$pos]) & 0xF0;
--- 70,76 ----
$pos = 0;
$len = strlen($str);
$ret = '';
!
while ($pos < $len)
{
$ord = ord($str[$pos]) & 0xF0;
***************
*** 252,258 ****
if (is_null($offset))
{
$ar = explode($needle, $str);
!
if (sizeof($ar) > 1)
{
// Pop off the end of the string where the last match was made
--- 252,258 ----
if (is_null($offset))
{
$ar = explode($needle, $str);
!
if (sizeof($ar) > 1)
{
// Pop off the end of the string where the last match was made
***************
*** 527,533 ****
$op = '^(?:' . $op . '.{' . $oy . '})';
}
else
! {
// offset == 0; just anchor the pattern
$op = '^';
}
--- 527,533 ----
$op = '^(?:' . $op . '.{' . $oy . '})';
}
else
! {
// offset == 0; just anchor the pattern
$op = '^';
}
***************
*** 560,566 ****
$lx = (int) ($length / 65535);
$ly = $length % 65535;
!
// negative length requires a captured group
// of length characters
if ($lx)
--- 560,566 ----
$lx = (int) ($length / 65535);
$ly = $length % 65535;
!
// negative length requires a captured group
// of length characters
if ($lx)
***************
*** 632,638 ****
{
return array($str);
}
!
preg_match_all('/.{' . $split_len . '}|[^\x00]{1,' . $split_len . '}$/us', $str, $ar);
return $ar[0];
}
--- 632,638 ----
{
return array($str);
}
!
preg_match_all('/.{' . $split_len . '}|[^\x00]{1,' . $split_len . '}$/us', $str, $ar);
return $ar[0];
}
***************
*** 1917,1920 ****
--- 1917,1948 ----
return implode($break, $new_lines);
}
+ /**
+ * UTF8-safe basename() function
+ *
+ * basename() has some limitations and is dependent on the locale setting
+ * according to the PHP manual. Therefore we provide our own locale independant
+ * basename function.
+ *
+ * @param string $filename The filename basename() should be applied to
+ * @return string The basenamed filename
+ */
+ function utf8_basename($filename)
+ {
+ // We always check for forward slash AND backward slash
+ // because they could be mixed or "sneaked" in. ;)
+ // You know, never trust user input...
+ if (strpos($filename, '/') !== false)
+ {
+ $filename = utf8_substr($filename, utf8_strrpos($filename, '/') + 1);
+ }
+
+ if (strpos($filename, '\\') !== false)
+ {
+ $filename = utf8_substr($filename, utf8_strrpos($filename, '\\') + 1);
+ }
+
+ return $filename;
+ }
+
?>
\ No newline at end of file
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 Sat Aug 1 13:28:50 2009
***************
*** 1613,1619 ****
}
// let's set up quick_reply
- // TODO: introduce a per-forum and a per-user setting
$s_quick_reply = $user->data['is_registered'] && $config['allow_quick_reply'] && ($topic_data['forum_flags'] & FORUM_FLAG_QUICK_REPLY) && $auth->acl_get('f_reply', $forum_id);
if ($s_can_vote || $s_quick_reply)
--- 1613,1618 ----
|
|
From: Joas S. <nic...@ph...> - 2009-08-01 11:44:26
|
Author: nickvergessen
Date: Sat Aug 1 12:43:39 2009
New Revision: 9903
Log:
Fix Bug #37585 - Correctly log action when users request to join a group
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/functions_user.php
branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Sat Aug 1 12:43:39 2009
***************
*** 182,187 ****
--- 182,188 ----
<li>[Fix] Correctly add user to a group making it a default one. (Bug #48345 - Patch by rxu)</li>
<li>[Fix] Add log entry when copying forum permissions.</li>
<li>[Fix] Min/max characters per posts also affects polls option (Bug #47295 - Patch by nickvergessen)</li>
+ <li>[Fix] Correctly log action when users request to join a group (Bug #37585 - Patch by nickvergessen)</li>
<li>[Fix] Do not try to create thumbnails for images we cannot open properly. (Bug #48695)</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_user.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_user.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_user.php Sat Aug 1 12:43:39 2009
***************
*** 2793,2799 ****
$group_name = get_group_name($group_id);
}
! $log = ($leader) ? 'LOG_MODS_ADDED' : 'LOG_USERS_ADDED';
add_log('admin', $log, $group_name, implode(', ', $username_ary));
--- 2793,2799 ----
$group_name = get_group_name($group_id);
}
! $log = ($leader) ? 'LOG_MODS_ADDED' : (($pending) ? 'LOG_USERS_PENDING' : 'LOG_USERS_ADDED');
add_log('admin', $log, $group_name, implode(', ', $username_ary));
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/common.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/common.php Sat Aug 1 12:43:39 2009
***************
*** 570,577 ****
'LOG_GROUP_REMOVE' => '<strong>Members removed from usergroup</strong> %1$s<br />» %2$s',
'LOG_GROUP_UPDATED' => '<strong>Usergroup details updated</strong><br />» %s',
'LOG_MODS_ADDED' => '<strong>Added new leaders to usergroup</strong> %1$s<br />» %2$s',
- 'LOG_USERS_APPROVED' => '<strong>Users approved in usergroup</strong> %1$s<br />» %2$s',
'LOG_USERS_ADDED' => '<strong>Added new members to usergroup</strong> %1$s<br />» %2$s',
'LOG_IMAGESET_ADD_DB' => '<strong>Added new imageset to database</strong><br />» %s',
'LOG_IMAGESET_ADD_FS' => '<strong>Add new imageset on filesystem</strong><br />» %s',
--- 570,578 ----
'LOG_GROUP_REMOVE' => '<strong>Members removed from usergroup</strong> %1$s<br />» %2$s',
'LOG_GROUP_UPDATED' => '<strong>Usergroup details updated</strong><br />» %s',
'LOG_MODS_ADDED' => '<strong>Added new leaders to usergroup</strong> %1$s<br />» %2$s',
'LOG_USERS_ADDED' => '<strong>Added new members to usergroup</strong> %1$s<br />» %2$s',
+ 'LOG_USERS_APPROVED' => '<strong>Users approved in usergroup</strong> %1$s<br />» %2$s',
+ 'LOG_USERS_PENDING' => '<strong>Users requested to join group â%1$sâ and need to be approved</strong><br />» %2$s',
'LOG_IMAGESET_ADD_DB' => '<strong>Added new imageset to database</strong><br />» %s',
'LOG_IMAGESET_ADD_FS' => '<strong>Add new imageset on filesystem</strong><br />» %s',
|
|
From: Meik S. <acy...@ph...> - 2009-08-01 11:08:31
|
Author: acydburn
Date: Sat Aug 1 12:07:48 2009
New Revision: 9902
Log:
some encoding fixes
Modified:
branches/phpBB-3_0_0/phpBB/language/en/acp/board.php
branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
branches/phpBB-3_0_0/phpBB/language/en/acp/posting.php
branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php
branches/phpBB-3_0_0/phpBB/language/en/memberlist.php
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/board.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/board.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/board.php Sat Aug 1 12:07:48 2009
***************
*** 486,492 ****
'EMAIL_SIG' => 'E-mail signature',
'EMAIL_SIG_EXPLAIN' => 'This text will be attached to all e-mails the board sends.',
'ENABLE_EMAIL' => 'Enable board-wide e-mails',
! 'ENABLE_EMAIL_EXPLAIN' => 'If this is set to disabled no e-mails will be sent by the board at all. <em>Note the user and admin account activation settings require this setting to be enabled. If currently using "user" or "admin" activation in the activation settings, disabling this setting will require no activation of new accounts.</em>',
'SMTP_AUTH_METHOD' => 'Authentication method for SMTP',
'SMTP_AUTH_METHOD_EXPLAIN' => 'Only used if a username/password is set, ask your provider if you are unsure which method to use.',
'SMTP_CRAM_MD5' => 'CRAM-MD5',
--- 486,492 ----
'EMAIL_SIG' => 'E-mail signature',
'EMAIL_SIG_EXPLAIN' => 'This text will be attached to all e-mails the board sends.',
'ENABLE_EMAIL' => 'Enable board-wide e-mails',
! 'ENABLE_EMAIL_EXPLAIN' => 'If this is set to disabled no e-mails will be sent by the board at all. <em>Note the user and admin account activation settings require this setting to be enabled. If currently using âuserâ or âadminâ activation in the activation settings, disabling this setting will require no activation of new accounts.</em>',
'SMTP_AUTH_METHOD' => 'Authentication method for SMTP',
'SMTP_AUTH_METHOD_EXPLAIN' => 'Only used if a username/password is set, ask your provider if you are unsure which method to use.',
'SMTP_CRAM_MD5' => 'CRAM-MD5',
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/common.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/common.php Sat Aug 1 12:07:48 2009
***************
*** 251,257 ****
'MANAGE' => 'Manage',
'MENU_TOGGLE' => 'Hide or display the side menu',
'MORE' => 'More', // Not used at the moment
! 'MORE_INFORMATION' => 'More information »',
'MOVE_DOWN' => 'Move down',
'MOVE_UP' => 'Move up',
--- 251,257 ----
'MANAGE' => 'Manage',
'MENU_TOGGLE' => 'Hide or display the side menu',
'MORE' => 'More', // Not used at the moment
! 'MORE_INFORMATION' => 'More information »',
'MOVE_DOWN' => 'Move down',
'MOVE_UP' => 'Move up',
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/posting.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/posting.php Sat Aug 1 12:07:48 2009
***************
*** 68,74 ****
'TOKEN' => 'Token',
'TOKENS' => 'Tokens',
! 'TOKENS_EXPLAIN' => 'Tokens are placeholders for user input. The input will be validated only if it matches the corresponding definition. If needed, you can number them by adding a number as the last character between the braces, e.g. {TEXT1}, {TEXT2}.<br /><br />Within the HTML replacement you can also use any language string present in your language/ directory like this: {L_<em><STRINGNAME></em>} where <em><STRINGNAME></em> is the name of the translated string you want to add. For example, {L_WROTE} will be displayed as "wrote" or its translation according to userâs locale.<br /><br /><strong>Please note that only tokens listed below are able to be used within custom BBCodes.</strong>',
'TOKEN_DEFINITION' => 'What can it be?',
'TOO_MANY_BBCODES' => 'You cannot create any more BBCodes. Please remove one or more BBCodes then try again.',
--- 68,74 ----
'TOKEN' => 'Token',
'TOKENS' => 'Tokens',
! 'TOKENS_EXPLAIN' => 'Tokens are placeholders for user input. The input will be validated only if it matches the corresponding definition. If needed, you can number them by adding a number as the last character between the braces, e.g. {TEXT1}, {TEXT2}.<br /><br />Within the HTML replacement you can also use any language string present in your language/ directory like this: {L_<em><STRINGNAME></em>} where <em><STRINGNAME></em> is the name of the translated string you want to add. For example, {L_WROTE} will be displayed as âwroteâ or its translation according to userâs locale.<br /><br /><strong>Please note that only tokens listed below are able to be used within custom BBCodes.</strong>',
'TOKEN_DEFINITION' => 'What can it be?',
'TOO_MANY_BBCODES' => 'You cannot create any more BBCodes. Please remove one or more BBCodes then try again.',
***************
*** 78,84 ****
'IDENTIFIER' => 'Characters from the latin alphabet (A-Z), numbers, hyphen and underscore',
'NUMBER' => 'Any series of digits',
'EMAIL' => 'A valid e-mail address',
! 'URL' => 'A valid URL using any protocol (http, ftp, etc⦠cannot be used for javascript exploits). If none is given, "http://" is prefixed to the string.',
'LOCAL_URL' => 'A local URL. The URL must be relative to the topic page and cannot contain a server name or protocol.',
'COLOR' => 'A HTML colour, can be either in the numeric form <samp>#FF1234</samp> or a <a href="http://www.w3.org/TR/CSS21/syndata.html#value-def-color">CSS colour keyword</a> such as <samp>fuchsia</samp> or <samp>InactiveBorder</samp>'
)
--- 78,84 ----
'IDENTIFIER' => 'Characters from the latin alphabet (A-Z), numbers, hyphen and underscore',
'NUMBER' => 'Any series of digits',
'EMAIL' => 'A valid e-mail address',
! 'URL' => 'A valid URL using any protocol (http, ftp, etc⦠cannot be used for javascript exploits). If none is given, âhttp://â is prefixed to the string.',
'LOCAL_URL' => 'A local URL. The URL must be relative to the topic page and cannot contain a server name or protocol.',
'COLOR' => 'A HTML colour, can be either in the numeric form <samp>#FF1234</samp> or a <a href="http://www.w3.org/TR/CSS21/syndata.html#value-def-color">CSS colour keyword</a> such as <samp>fuchsia</samp> or <samp>InactiveBorder</samp>'
)
Modified: branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php Sat Aug 1 12:07:48 2009
***************
*** 47,53 ****
'ANSWER' => 'Answer',
'EDIT_QUESTION' => 'Edit Question',
'QUESTIONS' => 'Questions',
! 'QUESTIONS_EXPLAIN' => 'Here you can add and edit questions to be asked on registration. You have to provide at least one question in the default board language to use this plugin. Questions should be easy for your target audience, but beyond the ability of google. Also, remember to change the questions regularly. If your question relies on punctuation, spelling or capitalisation, use the strict setting.',
'QUESTION_DELETED' => 'Question deleted',
'QUESTION_LANG' => 'Language',
'QUESTION_LANG_EXPLAIN' => 'The language this question and its answers is written in.',
--- 47,53 ----
'ANSWER' => 'Answer',
'EDIT_QUESTION' => 'Edit Question',
'QUESTIONS' => 'Questions',
! 'QUESTIONS_EXPLAIN' => 'Here you can add and edit questions to be asked on registration. You have to provide at least one question in the default board language to use this plugin. Questions should be easy for your target audience, but beyond the ability of Googleâ¢. Also, remember to change the questions regularly. If your question relies on punctuation, spelling or capitalisation, use the strict setting.',
'QUESTION_DELETED' => 'Question deleted',
'QUESTION_LANG' => 'Language',
'QUESTION_LANG_EXPLAIN' => 'The language this question and its answers is written in.',
Modified: branches/phpBB-3_0_0/phpBB/language/en/memberlist.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/memberlist.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/memberlist.php Sat Aug 1 12:07:48 2009
***************
*** 136,142 ****
'USER_FORUM' => 'User statistics',
'USER_LAST_REMINDED' => array(
0 => 'No reminder sent yet',
! 1 => '%1$d reminder sent<br />» %2$s',
),
'USER_ONLINE' => 'Online',
'USER_PRESENCE' => 'Board presence',
--- 136,142 ----
'USER_FORUM' => 'User statistics',
'USER_LAST_REMINDED' => array(
0 => 'No reminder sent yet',
! 1 => '%1$d reminder sent<br />» %2$s',
),
'USER_ONLINE' => 'Online',
'USER_PRESENCE' => 'Board presence',
|
|
From: Meik S. <acy...@ph...> - 2009-08-01 11:02:06
|
Author: acydburn
Date: Sat Aug 1 12:01:18 2009
New Revision: 9901
Log:
Fallback options for missing language files. (Bug #38575 - Patch by EXreaction)
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
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 Sat Aug 1 12:01:18 2009
***************
*** 254,259 ****
--- 254,260 ----
</li>
<li>[Feature] Display version check on ACP main page.</li>
<li>[Feature] Ability to copy permissions from one forum to several other forums.</li>
+ <li>[Feature] Fallback options for missing language files. (Bug #38575 - Patch by EXreaction)</li>
</ul>
<a name="v304"></a><h3>1.ii. Changes since 3.0.4</h3>
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 Sat Aug 1 12:01:18 2009
***************
*** 2006,2011 ****
--- 2006,2039 ----
$language_filename = $this->lang_path . $this->lang_name . '/' . (($use_help) ? 'help_' : '') . $lang_file . '.' . $phpEx;
}
+ if (!file_exists($language_filename))
+ {
+ global $config;
+
+ if ($this->lang_name == 'en')
+ {
+ // The user's selected language is missing the file, the board default's language is missing the file, and the file doesn't exist in /en.
+ $language_filename = str_replace($this->lang_path . 'en', $this->lang_path . $this->data['user_lang'], $language_filename);
+ trigger_error('Language file ' . $language_filename . ' couldn\'t be opened.', E_USER_ERROR);
+ }
+ else if ($this->lang_name == basename($config['default_lang']))
+ {
+ // Fall back to the English Language
+ $this->lang_name = 'en';
+ $this->set_lang($lang, $help, $lang_file, $use_db, $use_help);
+ }
+ else if ($this->lang_name == $this->data['user_lang'])
+ {
+ // Fall back to the board default language
+ $this->lang_name = basename($config['default_lang']);
+ $this->set_lang($lang, $help, $lang_file, $use_db, $use_help);
+ }
+
+ // Reset the lang name
+ $this->lang_name = (file_exists($this->lang_path . $this->data['user_lang'] . "/common.$phpEx")) ? $this->data['user_lang'] : basename($config['default_lang']);
+ return;
+ }
+
// Do not suppress error if in DEBUG_EXTRA mode
$include_result = (defined('DEBUG_EXTRA')) ? (include $language_filename) : (@include $language_filename);
***************
*** 2262,2272 ****
if ($group = remove_newly_registered($this->data['user_id'], $this->data))
{
$this->data['group_id'] = $group;
!
}
$this->data['user_permissions'] = '';
$this->data['user_new'] = 0;
!
return true;
}
}
--- 2290,2300 ----
if ($group = remove_newly_registered($this->data['user_id'], $this->data))
{
$this->data['group_id'] = $group;
!
}
$this->data['user_permissions'] = '';
$this->data['user_new'] = 0;
!
return true;
}
}
|
|
From: Meik S. <acy...@ph...> - 2009-08-01 10:40:54
|
Author: acydburn
Date: Sat Aug 1 11:40:00 2009
New Revision: 9900
Log:
adjust authors file... add contributions and new dev
Modified:
branches/phpBB-3_0_0/phpBB/docs/AUTHORS
Modified: branches/phpBB-3_0_0/phpBB/docs/AUTHORS
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/AUTHORS (original)
--- branches/phpBB-3_0_0/phpBB/docs/AUTHORS Sat Aug 1 11:40:00 2009
***************
*** 20,52 ****
Please see: http://www.phpbb.com/about/team/ for a list of all the people currently
involved in phpBB.
! phpBB Lead Developer : Acyd Burn (Meik Sievertsen)
! phpBB Developers : APTX (Marek A. R.)
! DavidMJ (David M.)
! dhn (Dominik Dröscher)
! kellanved (Henry Sudhof)
! naderman (Nils Adermann)
! Terrafrost (Jim Wigginton)
! ToonArmy (Chris Smith)
-- Previous Contributors --
! phpBB Project Manager : theFinn (James Atkinson) [Founder - 04/2007]
! SHS` (Jonathan Stanley)
!
! phpBB Lead Developer : psoTFX (Paul S. Owen) [2001 - 09/2005]
! phpBB Developers : Ashe (Ludovic Arnaud) [10/2002 - 11/2003, 06/2006 - 10/2006]
! BartVB (Bart van Bragt) [11/2000 - 03/2006]
! GrahamJE (Graham Eames) [09/2005 - 11/2006]
! Vic D'Elfant (Vic D'Elfant) [04/2007 - 04/2009]
-- Copyrights --
! Visual Confirmation : Xore (Robert Hetzler)
Original subSilver by subBlue Design, Tom Beddard, (c) 2001 phpBB Group
prosilver by subBlue Design, Tom Beddard, (c) 2004 phpBB Group
--- 20,58 ----
Please see: http://www.phpbb.com/about/team/ for a list of all the people currently
involved in phpBB.
! phpBB Lead Developer : Acyd Burn (Meik Sievertsen)
! phpBB Developers : APTX (Marek A. R.)
! Bantu (Andreas Fischer)
! DavidMJ (David M.)
! dhn (Dominik Dröscher)
! kellanved (Henry Sudhof)
! naderman (Nils Adermann)
! Terrafrost (Jim Wigginton)
! ToonArmy (Chris Smith)
!
! Contributions by : leviatan21 (Gabriel Vazquez)
! nickvergessen (Joas Schilling)
! Raimon (Raimon Meuldijk)
! rxu (Ruslan Uzdenov)
! Xore (Robert Hetzler)
-- Previous Contributors --
! phpBB Project Manager : theFinn (James Atkinson) [Founder - 04/2007]
! SHS` (Jonathan Stanley)
! phpBB Lead Developer : psoTFX (Paul S. Owen) [2001 - 09/2005]
+ phpBB Developers : Ashe (Ludovic Arnaud) [10/2002 - 11/2003, 06/2006 - 10/2006]
+ BartVB (Bart van Bragt) [11/2000 - 03/2006]
+ GrahamJE (Graham Eames) [09/2005 - 11/2006]
+ Vic D'Elfant (Vic D'Elfant) [04/2007 - 04/2009]
-- Copyrights --
! Visual Confirmation : Xore (Robert Hetzler)
Original subSilver by subBlue Design, Tom Beddard, (c) 2001 phpBB Group
prosilver by subBlue Design, Tom Beddard, (c) 2004 phpBB Group
|
|
From: Andreas F. <ba...@ph...> - 2009-07-31 15:50:09
|
Author: bantu
Date: Fri Jul 31 16:49:14 2009
New Revision: 9899
Log:
Fix bug #48695 - Do not try to create thumbnails for images we cannot open properly.
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/functions_posting.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Fri Jul 31 16:49:14 2009
***************
*** 182,187 ****
--- 182,188 ----
<li>[Fix] Correctly add user to a group making it a default one. (Bug #48345 - Patch by rxu)</li>
<li>[Fix] Add log entry when copying forum permissions.</li>
<li>[Fix] Min/max characters per posts also affects polls option (Bug #47295 - Patch by nickvergessen)</li>
+ <li>[Fix] Do not try to create thumbnails for images we cannot open properly. (Bug #48695)</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
<li>[Change] Template engine now permits to a limited extent variable includes.</li>
Modified: branches/phpBB-3_0_0/phpBB/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 Fri Jul 31 16:49:14 2009
***************
*** 696,701 ****
--- 696,706 ----
break;
}
+ if (empty($image))
+ {
+ return false;
+ }
+
if ($type['version'] == 1)
{
$new_image = imagecreate($new_width, $new_height);
|
|
From: Henry S. <kel...@ph...> - 2009-07-31 14:05:44
|
Author: Kellanved
Date: Fri Jul 31 15:05:24 2009
New Revision: 9898
Log:
check changed to allow for undefined lang entries. Proposed by a_jelly_donut
Modified:
branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_register.php
Modified: branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_register.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_register.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_register.php Fri Jul 31 15:05:24 2009
***************
*** 223,229 ****
if ($config['enable_confirm'])
{
$vc_response = $captcha->validate($data);
! if ($vc_response)
{
$error[] = $vc_response;
}
--- 223,229 ----
if ($config['enable_confirm'])
{
$vc_response = $captcha->validate($data);
! if ($vc_response !== false)
{
$error[] = $vc_response;
}
|
7 messages has been excluded from this view by a project administrator.
