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: Andreas F. <ba...@ph...> - 2009-07-19 22:23:10
|
Author: bantu
Date: Sun Jul 19 22:21:50 2009
New Revision: 9799
Log:
Set some svn properties. Cleanup.
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/acp_send_statistics.html (props changed)
branches/phpBB-3_0_0/phpBB/adm/style/captcha_default_acp_demo.html (contents, props changed)
branches/phpBB-3_0_0/phpBB/adm/style/captcha_gd_acp.html (props changed)
branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html (props changed)
branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp_demo.html (contents, props changed)
branches/phpBB-3_0_0/phpBB/adm/style/captcha_recaptcha.html (contents, props changed)
branches/phpBB-3_0_0/phpBB/adm/style/captcha_recaptcha_acp.html (props changed)
branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php (contents, props changed)
branches/phpBB-3_0_0/phpBB/language/en/recaptcha.php (contents, props changed)
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_default.html (props changed)
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html (contents, props changed)
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html (contents, props changed)
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html (contents, props changed)
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/acp_send_statistics.html
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/acp_send_statistics.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: branches/phpBB-3_0_0/phpBB/adm/style/captcha_default_acp_demo.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/captcha_default_acp_demo.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/captcha_default_acp_demo.html Sun Jul 19 22:21:50 2009
***************
*** 1,5 ****
-
<dl>
<dt><label for="captcha_preview">{L_PREVIEW}:</label><br /><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt>
<dd><img src="{CONFIRM_IMAGE}" alt="{L_PREVIEW}" width="360" height="96" id="captcha_preview" /></dd>
! </dl>
\ No newline at end of file
--- 1,4 ----
<dl>
<dt><label for="captcha_preview">{L_PREVIEW}:</label><br /><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt>
<dd><img src="{CONFIRM_IMAGE}" alt="{L_PREVIEW}" width="360" height="96" id="captcha_preview" /></dd>
! </dl>
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/captcha_default_acp_demo.html
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/captcha_default_acp_demo.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/captcha_gd_acp.html
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/captcha_gd_acp.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp_demo.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp_demo.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp_demo.html Sun Jul 19 22:21:50 2009
***************
*** 1,7 ****
<dl>
<dt><label for="answer">{L_CONFIRM_QUESTION}:</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
!
<dd>
! <input type="text" tabindex="10" name="answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" />
</dd>
</dl>
--- 1,7 ----
<dl>
<dt><label for="answer">{L_CONFIRM_QUESTION}:</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
!
<dd>
! <input type="text" tabindex="10" name="answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" />
</dd>
</dl>
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp_demo.html
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp_demo.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: branches/phpBB-3_0_0/phpBB/adm/style/captcha_recaptcha.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/captcha_recaptcha.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/captcha_recaptcha.html Sun Jul 19 22:21:50 2009
***************
*** 1,5 ****
<!-- IF S_RECAPTCHA_AVAILABLE -->
! <dl>
<dd>
<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
// <![CDATA[
--- 1,5 ----
<!-- IF S_RECAPTCHA_AVAILABLE -->
! <dl>
<dd>
<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
// <![CDATA[
***************
*** 8,25 ****
};
// ]]>
</script>
!
!
! <noscript>
! <div>
! <object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br />
! <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
! <input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
! </div>
</noscript>
!
</dd>
</dl>
<!-- ELSE -->
{L_RECAPTCHA_NOT_AVAILABLE}
! <!-- ENDIF -->
\ No newline at end of file
--- 8,25 ----
};
// ]]>
</script>
!
!
! <noscript>
! <div>
! <object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br />
! <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
! <input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
! </div>
</noscript>
!
</dd>
</dl>
<!-- ELSE -->
{L_RECAPTCHA_NOT_AVAILABLE}
! <!-- ENDIF -->
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/captcha_recaptcha.html
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/captcha_recaptcha.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/captcha_recaptcha_acp.html
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/captcha_recaptcha_acp.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
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 Sun Jul 19 22:21:50 2009
***************
*** 4,11 ****
* recaptcha [English]
*
* @package language
! * @version $Id: recaptcha.php 9709 2009-06-30 14:23:16Z Kellanved $
! * @copyright (c) 2008 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
--- 4,11 ----
* recaptcha [English]
*
* @package language
! * @version $Id$
! * @copyright (c) 2009 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
***************
*** 57,64 ****
'QUESTION_TEXT_EXPLAIN' => 'The question that will be asked on registration.',
'QA_ERROR_MSG' => 'Please fill out all fields and enter at least one answer.',
-
-
));
?>
\ No newline at end of file
--- 57,62 ----
Propchange: branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: branches/phpBB-3_0_0/phpBB/language/en/recaptcha.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/recaptcha.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/recaptcha.php Sun Jul 19 22:21:50 2009
***************
*** 5,11 ****
*
* @package language
* @version $Id$
! * @copyright (c) 2008 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
--- 5,11 ----
*
* @package language
* @version $Id$
! * @copyright (c) 2009 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
***************
*** 47,53 ****
'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
--- 47,52 ----
Propchange: branches/phpBB-3_0_0/phpBB/language/en/recaptcha.php
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_default.html
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_default.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html Sun Jul 19 22:21:50 2009
***************
*** 4,14 ****
<h3>{L_CONFIRMATION}</h3>
<fieldset class="fields2">
-
<!-- ENDIF -->
<dl>
! <dt><label>{CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
<dd>
<input type="text" tabindex="10" name="answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" />
<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" />
--- 4,13 ----
<h3>{L_CONFIRMATION}</h3>
<fieldset class="fields2">
<!-- ENDIF -->
<dl>
! <dt><label>{CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
<dd>
<input type="text" tabindex="10" name="answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" />
<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" />
***************
*** 20,23 ****
<span class="corners-bottom"><span></span></span></div>
</div>
<!-- ENDIF -->
-
--- 19,21 ----
Propchange: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html Sun Jul 19 22:21:50 2009
***************
*** 6,18 ****
<p>{L_CONFIRM_EXPLAIN}</p>
<fieldset class="fields2">
-
<!-- ENDIF -->
<!-- IF S_RECAPTCHA_AVAILABLE -->
<dl>
! <dt><label>{L_CONFIRM_CODE}</label>:<br /><span>{L_RECAPTCHA_EXPLAIN}</span></dt>
<dd>
!
<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
// <![CDATA[
var RecaptchaOptions = {
--- 6,18 ----
<p>{L_CONFIRM_EXPLAIN}</p>
<fieldset class="fields2">
<!-- ENDIF -->
+
<!-- IF S_RECAPTCHA_AVAILABLE -->
<dl>
! <dt><label>{L_CONFIRM_CODE}</label>:<br /><span>{L_RECAPTCHA_EXPLAIN}</span></dt>
<dd>
!
<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
// <![CDATA[
var RecaptchaOptions = {
***************
*** 20,43 ****
};
// ]]>
</script>
!
!
! <noscript>
! <div>
! <object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br />
! <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
! <input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
! </div>
</noscript>
!
</dd>
</dl>
<!-- ELSE -->
{L_RECAPTCHA_NOT_AVAILABLE}
<!-- ENDIF -->
<!-- IF S_TYPE == 1 -->
</fieldset>
<span class="corners-bottom"><span></span></span></div>
</div>
<!-- ENDIF -->
-
--- 20,42 ----
};
// ]]>
</script>
!
! <noscript>
! <div>
! <object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br />
! <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
! <input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
! </div>
</noscript>
!
</dd>
</dl>
<!-- ELSE -->
{L_RECAPTCHA_NOT_AVAILABLE}
<!-- ENDIF -->
+
<!-- IF S_TYPE == 1 -->
</fieldset>
<span class="corners-bottom"><span></span></span></div>
</div>
<!-- ENDIF -->
Propchange: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
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 Jul 19 22:21:50 2009
***************
*** 11,17 ****
// ]]>
</script>
<form method="post" action="{U_QR_ACTION}">
-
<div class="panel" id="qr_editor_div">
<div class="inner"><span class="corners-top"><span></span></span>
<div class="content">
--- 11,16 ----
Propchange: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
|
|
From: Meik S. <acy...@ph...> - 2009-07-19 11:42:27
|
Author: acydburn
Date: Sun Jul 19 11:41:57 2009
New Revision: 9798
Log:
QR changes to let the options actually work (we use checkboxes and isset())
Modified:
branches/phpBB-3_0_0/phpBB/viewtopic.php
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 Sun Jul 19 11:41:57 2009
***************
*** 1435,1441 ****
{
$s_first_unread = $first_unread = true;
}
!
//
$postrow = array(
--- 1435,1441 ----
{
$s_first_unread = $first_unread = true;
}
!
//
$postrow = array(
***************
*** 1614,1654 ****
// 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 )
{
add_form_key('posting');
if ($s_quick_reply)
{
!
! $s_attach_sig = $config['allow_sig'] && strlen($user->data['user_sig']) && $user->optionget('attachsig') && $auth->acl_get('f_sigs', $forum_id) && $auth->acl_get('u_sig');
! $s_smilies = $config['allow_smilies'] && $user->optionget('smilies') && $auth->acl_get('f_smilies', $forum_id);
! $s_bbcode = $config['allow_bbcode'] && $user->optionget('bbcode') && $auth->acl_get('f_bbcode', $forum_id);
! $s_notify = $config['allow_topic_notify'] && $user->data['user_notify'];
$qr_hidden_fields = array(
! 'topic_cur_post_id' => $topic_data['topic_last_post_id'],
! 'lastclick' => time(),
! 'topic_id' => $topic_data['topic_id'],
! 'forum_id' => $forum_id,
! 'disable_bbcode' => !$s_bbcode,
! 'disable_smilies' => !$s_smilies,
! 'disable_magic_url' => !$config['allow_post_links'],
! 'attach_sig' => $s_attach_sig,
! 'notify' => $s_notify,
);
!
$template->assign_vars(array(
! 'S_QUICK_REPLY' => true,
'U_QR_ACTION' => append_sid("{$phpbb_root_path}posting.$phpEx", "mode=reply&f=$forum_id&t=$topic_id"),
'QR_HIDDEN_FIELDS' => build_hidden_fields($qr_hidden_fields),
'SUBJECT' => 'Re: ' . censor_text($topic_data['topic_title']),
-
));
}
}
// now I have the urge to wash my hands :(
!
!
// We overwrite $_REQUEST['f'] if there is no forum specified
// to be able to display the correct online list.
// One downside is that the user currently viewing this topic/post is not taken into account.
--- 1614,1657 ----
// 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)
{
add_form_key('posting');
+
if ($s_quick_reply)
{
! $s_attach_sig = $config['allow_sig'] && $user->optionget('attachsig') && $auth->acl_get('f_sigs', $forum_id) && $auth->acl_get('u_sig');
! $s_smilies = $config['allow_smilies'] && $user->optionget('smilies') && $auth->acl_get('f_smilies', $forum_id);
! $s_bbcode = $config['allow_bbcode'] && $user->optionget('bbcode') && $auth->acl_get('f_bbcode', $forum_id);
! $s_notify = $config['allow_topic_notify'] && $user->data['user_notify'];
!
$qr_hidden_fields = array(
! 'topic_cur_post_id' => (int) $topic_data['topic_last_post_id'],
! 'lastclick' => (int) time(),
! 'topic_id' => (int) $topic_data['topic_id'],
! 'forum_id' => (int) $forum_id,
);
!
! // Originally we use checkboxes and check with isset(), so we only provide them if they would be checked
! (!$s_bbcode) ? $qr_hidden_fields['disable_bbcode'] = 1 : true;
! (!$s_smilies) ? $qr_hidden_fields['disable_smilies'] = 1 : true;
! (!$config['allow_post_links']) ? $qr_hidden_fields['disable_magic_url'] = 1 : true;
! ($s_attach_sig) ? $qr_hidden_fields['attach_sig'] = 1 : true;
! ($s_notify) ? $qr_hidden_fields['notify'] = 1 : true;
!
$template->assign_vars(array(
! 'S_QUICK_REPLY' => true,
'U_QR_ACTION' => append_sid("{$phpbb_root_path}posting.$phpEx", "mode=reply&f=$forum_id&t=$topic_id"),
'QR_HIDDEN_FIELDS' => build_hidden_fields($qr_hidden_fields),
'SUBJECT' => 'Re: ' . censor_text($topic_data['topic_title']),
));
}
}
// now I have the urge to wash my hands :(
!
!
// We overwrite $_REQUEST['f'] if there is no forum specified
// to be able to display the correct online list.
// One downside is that the user currently viewing this topic/post is not taken into account.
|
|
From: Chris S. <too...@ph...> - 2009-07-19 11:34:40
|
Author: toonarmy
Date: Sun Jul 19 11:34:01 2009
New Revision: 9797
Log:
Copy poll options properly when copying topic. #39065
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_main.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Sun Jul 19 11:34:01 2009
***************
*** 167,172 ****
--- 167,173 ----
<li>[Fix] Permit null values for non-required integer custom profile fields and ensure zero complies with the range limits. (Bug #40925)</li>
<li>[Fix] Allow changing forum from select box under certain circumstances. (Bug #37525)</li>
<li>[Fix] Display required fields notice on registration above the custom profile fields. (Bug #39665)</li>
+ <li>[Fix] Copy poll options properly when copying topic. (Bug #39065)</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/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 Sun Jul 19 11:34:01 2009
***************
*** 1064,1070 ****
'topic_bumper' => (int) $topic_row['topic_bumper'],
'poll_title' => (string) $topic_row['poll_title'],
'poll_start' => (int) $topic_row['poll_start'],
! 'poll_length' => (int) $topic_row['poll_length']
);
$db->sql_query('INSERT INTO ' . TOPICS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
--- 1064,1072 ----
'topic_bumper' => (int) $topic_row['topic_bumper'],
'poll_title' => (string) $topic_row['poll_title'],
'poll_start' => (int) $topic_row['poll_start'],
! 'poll_length' => (int) $topic_row['poll_length'],
! 'poll_max_options' => (int) $topic_row['poll_max_options'],
! 'poll_vote_change' => (int) $topic_row['poll_vote_change'],
);
$db->sql_query('INSERT INTO ' . TOPICS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
|
|
From: Chris S. <too...@ph...> - 2009-07-19 11:08:09
|
Author: toonarmy
Date: Sun Jul 19 11:07:32 2009
New Revision: 9796
Log:
Display required fields notice on registration above the custom profile fields. #39665
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_register.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 Sun Jul 19 11:07:32 2009
***************
*** 166,171 ****
--- 166,172 ----
<li>[Fix] Ensure user errors are displayed regardless of PHP settings. (Bug #47505)</li>
<li>[Fix] Permit null values for non-required integer custom profile fields and ensure zero complies with the range limits. (Bug #40925)</li>
<li>[Fix] Allow changing forum from select box under certain circumstances. (Bug #37525)</li>
+ <li>[Fix] Display required fields notice on registration above the custom profile fields. (Bug #39665)</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/styles/prosilver/template/ucp_register.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html Sun Jul 19 11:07:32 2009
***************
*** 26,34 ****
<!-- IF L_REG_COND -->
<dl><dd><strong>{L_REG_COND}</strong></dd></dl>
<!-- ENDIF -->
- <!-- IF .profile_fields -->
- <dl><dd><strong>{L_ITEMS_REQUIRED}</strong></dd></dl>
- <!-- ENDIF -->
<dl>
<dt><label for="username">{L_USERNAME}:</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>
--- 26,31 ----
***************
*** 62,67 ****
--- 59,67 ----
<dd><select name="tz" id="tz" class="autowidth">{S_TZ_OPTIONS}</select></dd>
</dl>
+ <!-- IF .profile_fields -->
+ <dl><dd><strong>{L_ITEMS_REQUIRED}</strong></dd></dl>
+
<!-- BEGIN profile_fields -->
<dl>
<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}:<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label>
***************
*** 70,75 ****
--- 70,77 ----
<dd>{profile_fields.FIELD}</dd>
</dl>
<!-- END profile_fields -->
+ <!-- ENDIF -->
+
</fieldset>
<span class="corners-bottom"><span></span></span></div>
</div>
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_register.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_register.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_register.html Sun Jul 19 11:07:32 2009
***************
*** 32,42 ****
<td class="row2" colspan="2"><span class="gensmall">{L_REG_COND}</span></td>
</tr>
<!-- ENDIF -->
- <!-- IF .profile_fields -->
- <tr>
- <td class="row2" colspan="2"><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
- </tr>
- <!-- ENDIF -->
<tr>
<td class="row1" width="38%"><b class="genmed">{L_USERNAME}: </b><br /><span class="gensmall">{L_USERNAME_EXPLAIN}</span></td>
--- 32,37 ----
***************
*** 66,71 ****
--- 61,70 ----
<td class="row1"><b class="genmed">{L_TIMEZONE}: </b></td>
<td class="row2"><select name="tz">{S_TZ_OPTIONS}</select></td>
</tr>
+ <!-- IF .profile_fields -->
+ <tr>
+ <td class="row2" colspan="2"><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
+ </tr>
<!-- BEGIN profile_fields -->
<tr>
<td class="row1" width="35%">
***************
*** 77,82 ****
--- 76,82 ----
</tr>
<!-- END profile_fields -->
+ <!-- ENDIF -->
<!-- IF CAPTCHA_TEMPLATE -->
<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
|
|
From: Henry S. <kel...@ph...> - 2009-07-19 09:54:54
|
Author: Kellanved
Date: Sun Jul 19 09:54:26 2009
New Revision: 9795
Log:
change lang string
Modified:
branches/phpBB-3_0_0/phpBB/language/en/acp/board.php
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/board.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/board.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/board.php Sun Jul 19 09:54:26 2009
***************
*** 311,317 ****
'VISUAL_CONFIRM_REG' => 'Enable visual confirmation for registrations',
'VISUAL_CONFIRM_REG_EXPLAIN' => 'Requires new users to enter a random code matching an image to help prevent mass registrations.',
'VISUAL_CONFIRM_REFRESH' => 'Enable users to refresh the confirmation image',
! 'VISUAL_CONFIRM_REFRESH_EXPLAIN' => 'Allows users to request new confirmation codes, if they are unable to solve the VC during registration.',
));
// Cookie Settings
--- 311,317 ----
'VISUAL_CONFIRM_REG' => 'Enable visual confirmation for registrations',
'VISUAL_CONFIRM_REG_EXPLAIN' => 'Requires new users to enter a random code matching an image to help prevent mass registrations.',
'VISUAL_CONFIRM_REFRESH' => 'Enable users to refresh the confirmation image',
! 'VISUAL_CONFIRM_REFRESH_EXPLAIN' => 'Allows users to request new confirmation codes, if they are unable to solve the VC during registration. Some plugins might not support this option.',
));
// Cookie Settings
|
|
From: Henry S. <kel...@ph...> - 2009-07-19 09:52:15
|
Author: Kellanved
Date: Sun Jul 19 09:51:50 2009
New Revision: 9794
Log:
First round of fixes
Modified:
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php Sun Jul 19 09:51:50 2009
***************
*** 225,231 ****
),
'PRIMARY_KEY' => 'question_id',
'KEYS' => array(
! 'question_id' => array('INDEX', array('question_id', 'language_iso')),
),
),
ANSWERS_TABLE => array (
--- 225,231 ----
),
'PRIMARY_KEY' => 'question_id',
'KEYS' => array(
! 'question_id' => array('INDEX', array('question_id', 'lang_iso')),
),
),
ANSWERS_TABLE => array (
|
|
From: Henry S. <kel...@ph...> - 2009-07-19 09:51:55
|
Author: Kellanved
Date: Sun Jul 19 09:51:25 2009
New Revision: 9793
Log:
First round of fixes
Modified:
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php Sun Jul 19 09:51:25 2009
***************
*** 97,106 ****
include("$phpbb_root_path/includes/db/db_tools.$phpEx");
}
$db_tool = new phpbb_db_tools($db);
! if (!$db_tool->sql_table_exists(QUESTIONS_TABLE))
! {
! return false;
! }
}
function is_available()
--- 97,103 ----
include("$phpbb_root_path/includes/db/db_tools.$phpEx");
}
$db_tool = new phpbb_db_tools($db);
! return $db_tool->sql_table_exists(QUESTIONS_TABLE);
}
function is_available()
***************
*** 109,115 ****
$user->add_lang('captcha_qa');
! if (self::is_installed())
{
return false;
}
--- 106,112 ----
$user->add_lang('captcha_qa');
! if (!self::is_installed())
{
return false;
}
|
|
From: Henry S. <kel...@ph...> - 2009-07-19 09:46:54
|
Author: Kellanved
Date: Sun Jul 19 09:46:32 2009
New Revision: 9792
Log:
First round of fixes
Modified:
branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php
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 Sun Jul 19 09:46:32 2009
***************
*** 37,43 ****
$lang = array_merge($lang, array(
'CAPTCHA_QA' => 'Q&A CAPTCHA',
! 'CONFIRM_QUESTION_EXPLAIN' => 'Please answer this question to avoid automatted registrations.',
'CONFIRM_QUESTION_WRONG' => 'The answer to the confirmation question was not recognized.',
'QUESTION_ANSWERS' => 'Answers',
--- 37,43 ----
$lang = array_merge($lang, array(
'CAPTCHA_QA' => 'Q&A CAPTCHA',
! 'CONFIRM_QUESTION_EXPLAIN' => 'Please answer this question to avoid automated registrations.',
'CONFIRM_QUESTION_WRONG' => 'The answer to the confirmation question was not recognized.',
'QUESTION_ANSWERS' => 'Answers',
***************
*** 48,54 ****
'QUESTIONS' => 'Questions',
'QUESTIONS_EXPLAIN' => 'Here you can add enter and edit questions to be asked on registration to ward against automatted installs.',
'QUESTION_DELETED' => 'Question deleted',
! 'QUESTION_LANG' => 'Language',
'QUESTION_LANG_EXPLAIN' => 'The language this question and its answers is written in.',
'QUESTION_STRICT' => 'Strict check',
'QUESTION_STRICT_EXPLAIN' => 'If enabled, the check also recognizes capitalization and whitespaces.',
--- 48,54 ----
'QUESTIONS' => 'Questions',
'QUESTIONS_EXPLAIN' => 'Here you can add enter and edit questions to be asked on registration to ward against automatted installs.',
'QUESTION_DELETED' => 'Question deleted',
! 'QUESTION_LANG' => 'Language',
'QUESTION_LANG_EXPLAIN' => 'The language this question and its answers is written in.',
'QUESTION_STRICT' => 'Strict check',
'QUESTION_STRICT_EXPLAIN' => 'If enabled, the check also recognizes capitalization and whitespaces.',
|
|
From: Henry S. <kel...@ph...> - 2009-07-19 09:46:04
|
Author: Kellanved
Date: Sun Jul 19 09:45:23 2009
New Revision: 9791
Log:
First round of fixes
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html
branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp_demo.html
branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html
Modified: branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html Sun Jul 19 09:45:23 2009
***************
*** 75,81 ****
</dl>
<dl>
<dt><label for="answers">{L_QUESTION_ANSWERS}</label><br /><span>{L_ANSWERS_EXPLAIN}</span></dt>
! <dd><textarea id="answers" name="answers">{ANSWERS}</textarea></dd>
</dl>
</fieldset>
<fieldset class="quick">
--- 75,81 ----
</dl>
<dl>
<dt><label for="answers">{L_QUESTION_ANSWERS}</label><br /><span>{L_ANSWERS_EXPLAIN}</span></dt>
! <dd><textarea id="answers" name="answers" rows="15" cols="80" >{ANSWERS}</textarea></dd>
</dl>
</fieldset>
<fieldset class="quick">
Modified: branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp_demo.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp_demo.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp_demo.html Sun Jul 19 09:45:23 2009
***************
*** 1,7 ****
<dl>
! <dt><label for="answer">{L_QUESTION}:</label><br /><span>{L_QUESTION_EXPLAIN}</span></dt>
<dd>
! <input type="text" />
</dd>
</dl>
--- 1,7 ----
<dl>
! <dt><label for="answer">{L_CONFIRM_QUESTION}:</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
<dd>
! <input type="text" tabindex="10" name="answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" />
</dd>
</dl>
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 Sun Jul 19 09:45:23 2009
***************
*** 42,47 ****
--- 42,50 ----
'QUESTION_ANSWERS' => 'Answers',
'ANSWERS_EXPLAIN' => 'The Answers. Please write one answer per line.',
+ 'CONFIRM_QUESTION' => 'Question',
+
+ 'ANSWER' => 'Answer',
'QUESTIONS' => 'Questions',
'QUESTIONS_EXPLAIN' => 'Here you can add enter and edit questions to be asked on registration to ward against automatted installs.',
'QUESTION_DELETED' => 'Question deleted',
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html Sun Jul 19 09:45:23 2009
***************
*** 10,16 ****
<dl>
<dt><label>{CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
<dd>
! <input type="text" tabindex="10" name="answer" id="answer" size="25" value="{USERNAME}" class="inputbox autowidth" title="{L_ANSWER}" />
<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" />
</dd>
</dl>
--- 10,16 ----
<dl>
<dt><label>{CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
<dd>
! <input type="text" tabindex="10" name="answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" />
<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" />
</dd>
</dl>
|
|
From: Chris S. <too...@ph...> - 2009-07-19 09:42:12
|
Author: toonarmy
Date: Sun Jul 19 09:41:09 2009
New Revision: 9790
Log:
Cache get_username_string() function calls on viewtopic.
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
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 Sun Jul 19 09:41:09 2009
***************
*** 186,191 ****
--- 186,192 ----
<li>[Change] Add confirmation for deactivating language packs (Patch by leviatan21)</li>
<li>[Change] Add confirm-box when deleting permissions (Bug #13673 - Patch by nickvergessen)</li>
<li>[Change] Add pagination for icons and smilies in the ACP and smilies in the smiley popup</li>
+ <li>[Change] Cache get_username_string() function calls on viewtopic.</li>
<li>[Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)</li>
<li>[Feature] Backported 3.2 captcha plugins.</li>
<li>[Feature] Introduced new ACM plugins:
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 Sun Jul 19 09:41:09 2009
***************
*** 1116,1121 ****
--- 1116,1126 ----
'yim' => ($row['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($row['user_yim']) . '&.src=pg' : '',
'jabber' => ($row['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=jabber&u=$poster_id") : '',
'search' => ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id=$poster_id&sr=posts") : '',
+
+ 'author_full' => get_username_string('full', $poster_id, $row['username'], $row['user_colour']),
+ 'author_colour' => get_username_string('colour', $poster_id, $row['username'], $row['user_colour']),
+ 'author_username' => get_username_string('username', $poster_id, $row['username'], $row['user_colour']),
+ 'author_profile' => get_username_string('profile', $poster_id, $row['username'], $row['user_colour']),
);
get_user_rank($row['user_rank'], $row['user_posts'], $user_cache[$poster_id]['rank_title'], $user_cache[$poster_id]['rank_image'], $user_cache[$poster_id]['rank_image_src']);
***************
*** 1434,1443 ****
//
$postrow = array(
! 'POST_AUTHOR_FULL' => get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
! 'POST_AUTHOR_COLOUR' => get_username_string('colour', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
! 'POST_AUTHOR' => get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
! 'U_POST_AUTHOR' => get_username_string('profile', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
'RANK_TITLE' => $user_cache[$poster_id]['rank_title'],
'RANK_IMG' => $user_cache[$poster_id]['rank_image'],
--- 1439,1448 ----
//
$postrow = array(
! 'POST_AUTHOR_FULL' => ($poster_id != ANONYMOUS) ? $user_cache[$poster_id]['author_full'] : get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
! 'POST_AUTHOR_COLOUR' => ($poster_id != ANONYMOUS) ? $user_cache[$poster_id]['author_colour'] : get_username_string('colour', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
! 'POST_AUTHOR' => ($poster_id != ANONYMOUS) ? $user_cache[$poster_id]['author_username'] : get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
! 'U_POST_AUTHOR' => ($poster_id != ANONYMOUS) ? $user_cache[$poster_id]['author_profile'] : get_username_string('profile', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
'RANK_TITLE' => $user_cache[$poster_id]['rank_title'],
'RANK_IMG' => $user_cache[$poster_id]['rank_image'],
|
|
From: Chris S. <too...@ph...> - 2009-07-19 01:01:48
|
Author: toonarmy
Date: Sun Jul 19 01:00:33 2009
New Revision: 9789
Log:
Allow changing forum from drop down under certain circumstances. #37525
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_reports.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Sun Jul 19 01:00:33 2009
***************
*** 165,170 ****
--- 165,171 ----
<li>[Fix] Reorder frame order of animated subsilver2 topic icons to be useful when animation is disabled. (Bug #29385 - Patch by prototech)</li>
<li>[Fix] Ensure user errors are displayed regardless of PHP settings. (Bug #47505)</li>
<li>[Fix] Permit null values for non-required integer custom profile fields and ensure zero complies with the range limits. (Bug #40925)</li>
+ <li>[Fix] Allow changing forum from select box under certain circumstances. (Bug #37525)</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/mcp/mcp_reports.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_reports.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_reports.php Sun Jul 19 01:00:33 2009
***************
*** 258,264 ****
}
unset($forum_list_read);
! if ($topic_id && $forum_id)
{
$topic_info = get_topic_data(array($topic_id));
--- 258,264 ----
}
unset($forum_list_read);
! if ($topic_id)
{
$topic_info = get_topic_data(array($topic_id));
***************
*** 267,278 ****
trigger_error('TOPIC_NOT_EXIST');
}
! $topic_info = $topic_info[$topic_id];
! $forum_id = $topic_info['forum_id'];
! }
! else if ($topic_id && !$forum_id)
! {
! $topic_id = 0;
}
$forum_list = array();
--- 267,281 ----
trigger_error('TOPIC_NOT_EXIST');
}
! if ($forum_id != $topic_info[$topic_id]['forum_id'])
! {
! $topic_id = 0;
! }
! else
! {
! $topic_info = $topic_info[$topic_id];
! $forum_id = (int) $topic_info['forum_id'];
! }
}
$forum_list = array();
|
|
From: Chris S. <too...@ph...> - 2009-07-19 00:21:03
|
Author: toonarmy
Date: Sun Jul 19 00:20:03 2009
New Revision: 9788
Log:
Permit null values for non-required integer custom profile fields and ensure zero complies with the range limits. #40925
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/functions_profile_fields.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Sun Jul 19 00:20:03 2009
***************
*** 164,169 ****
--- 164,170 ----
<li>[Fix] Remove redundant SQL query from ucp.php. (Bug #40305)</li>
<li>[Fix] Reorder frame order of animated subsilver2 topic icons to be useful when animation is disabled. (Bug #29385 - Patch by prototech)</li>
<li>[Fix] Ensure user errors are displayed regardless of PHP settings. (Bug #47505)</li>
+ <li>[Fix] Permit null values for non-required integer custom profile fields and ensure zero complies with the range limits. (Bug #40925)</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_profile_fields.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_profile_fields.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_profile_fields.php Sun Jul 19 00:20:03 2009
***************
*** 92,109 ****
{
switch ($field_type)
{
- case FIELD_INT:
- case FIELD_DROPDOWN:
- $field_value = (int) $field_value;
- break;
-
- case FIELD_BOOL:
- $field_value = (bool) $field_value;
- break;
- }
-
- switch ($field_type)
- {
case FIELD_DATE:
$field_validate = explode('-', $field_value);
--- 92,97 ----
***************
*** 133,138 ****
--- 121,128 ----
break;
case FIELD_BOOL:
+ $field_value = (bool) $field_value;
+
if (!$field_value && $field_data['field_required'])
{
return 'FIELD_REQUIRED';
***************
*** 140,149 ****
break;
case FIELD_INT:
! if (empty($field_value) && !$field_data['field_required'])
{
return false;
}
if ($field_value < $field_data['field_minlen'])
{
--- 130,141 ----
break;
case FIELD_INT:
! if (trim($field_value) === '' && !$field_data['field_required'])
{
return false;
}
+
+ $field_value = (int) $field_value;
if ($field_value < $field_data['field_minlen'])
{
***************
*** 156,161 ****
--- 148,155 ----
break;
case FIELD_DROPDOWN:
+ $field_value = (int) $field_value;
+
if ($field_value == $field_data['field_novalue'] && $field_data['field_required'])
{
return 'FIELD_REQUIRED';
***************
*** 514,520 ****
switch ($this->profile_types[$field_type])
{
case 'int':
! if ($value == '')
{
return NULL;
}
--- 508,514 ----
switch ($this->profile_types[$field_type])
{
case 'int':
! if ($value === '')
{
return NULL;
}
***************
*** 644,650 ****
}
}
! return (is_null($value)) ? '' : (int) $value;
}
else
{
--- 638,644 ----
}
}
! return (is_null($value) || $value === '') ? '' : (int) $value;
}
else
{
|
|
From: Henry S. <kel...@ph...> - 2009-07-18 23:56:37
|
Author: Kellanved
Date: Sat Jul 18 23:37:09 2009
New Revision: 9786
Log:
Initial commit for the QA captcha. Needs language & style finetuning and bug searching & fixing
Added:
branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html (with props)
branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp_demo.html (with props)
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php (with props)
branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php (with props)
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html (with props)
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_qa.html (with props)
Added: branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html (added)
--- branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html Sat Jul 18 23:37:09 2009
***************
*** 0 ****
--- 1,93 ----
+ <!-- INCLUDE overall_header.html -->
+
+ <a name="maincontent"></a>
+
+
+
+ <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a>
+
+ <h1>{L_QUESTIONS}</h1>
+
+ <p>{L_QUESTIONS_EXPLAIN}</p>
+ <!-- IF S_LIST -->
+ <form id="captcha_qa" method="post" action="{U_ACTION}">
+
+ <fieldset class="tabulated">
+ <legend>{L_QUESTIONS}</legend>
+
+ <table cellspacing="1">
+ <thead>
+ <tr>
+ <th colspan="3">{L_QUESTIONS}</th>
+ </tr>
+ <tr class="row3">
+ <td style="text-align: center;">{L_QUESTION_TEXT}</td>
+ <td style="text-align: center;">{L_QUESTION_LANG}</td>
+ <td style="text-align: center;">{L_ACTION}</td>
+ </tr>
+ </thead>
+ <tbody>
+ <!-- BEGIN questions -->
+
+ <!-- IF questions.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
+ <td style="text-align: center;">{questions.QUESTION_TEXT}</td>
+ <td style="text-align: center;">{questions.QUESTION_LANG}</td>
+ <td style="text-align: center;"><a href="{questions.U_EDIT}">{ICON_EDIT}</a><a href="{questions.U_DELETE}">{ICON_DELETE}</a></td>
+ </tr>
+ <!-- END questions -->
+ </tbody>
+ </table>
+ <fieldset class="quick">
+ <input class="button1" type="submit" name="add" value="{L_ADD}" />
+ <input type="hidden" name="action" value="add" />
+ <input type="hidden" name="configure" value="1" />
+ <input type="hidden" name="select_captcha" value="{CLASS}" />
+
+ {S_FORM_TOKEN}
+ </fieldset>
+ {S_FORM_TOKEN}
+ </fieldset>
+ </form>
+ <!-- ELSE -->
+ <!-- IF S_ERROR -->
+ <div class="errorbox">
+ <h3>{L_WARNING}</h3>
+ <p>{QA_ERROR_MSG}</p>
+ </div>
+ <!-- ENDIF -->
+ <form id="captcha_qa" method="post" action="{U_ACTION}">
+ <fieldset>
+ <legend>{L_QUESTIONS}</legend>
+ <dl>
+ <dt><label for="strict">{L_QUESTION_STRICT}:</label><br /><span>{L_QUESTION_STRICT_EXPLAIN}</span></dt>
+ <dd><label><input type="radio" class="radio" name="strict" value="1"<!-- IF STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+ <label><input type="radio" class="radio" name="strict" value="0"<!-- IF not STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+ </dl>
+
+ <dl>
+ <dt><label for="lang_iso">{L_QUESTION_LANG}</label><br /><span>{L_QUESTION_LANG_EXPLAIN}</span></dt>
+ <dd><select id="lang_iso" name="lang_iso"><!-- BEGIN langs --><option value="{langs.ISO}" <!-- IF langs.ISO == LANG_ISO --> selected="selected" <!-- ENDIF -->>{langs.NAME}</option><!-- END langs --></select></dd>
+ </dl>
+ <dl>
+ <dt><label for="question_text">{L_QUESTION_TEXT}</label><br /><span>{L_QUESTION_TEXT_EXPLAIN}</span></dt>
+ <dd><input id="question_text" name="question_text" type="text" value="{QUESTION_TEXT}" /></dd>
+ </dl>
+ <dl>
+ <dt><label for="answers">{L_QUESTION_ANSWERS}</label><br /><span>{L_ANSWERS_EXPLAIN}</span></dt>
+ <dd><textarea id="answers" name="answers">{ANSWERS}</textarea></dd>
+ </dl>
+ </fieldset>
+ <fieldset class="quick">
+ <input class="button1" type="submit" name="submit" value="{L_SUBMIT}" />
+ <input type="hidden" name="question_id" value="{QUESTION_ID}" />
+ <input type="hidden" name="action" value="add" />
+ <input type="hidden" name="configure" value="1" />
+ <input type="hidden" name="select_captcha" value="{CLASS}" />
+
+ {S_FORM_TOKEN}
+ </fieldset>
+ </form>
+ <!-- ENDIF -->
+
+ <!-- INCLUDE overall_footer.html -->
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html
------------------------------------------------------------------------------
svn:executable = *
Added: branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp_demo.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp_demo.html (added)
--- branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp_demo.html Sat Jul 18 23:37:09 2009
***************
*** 0 ****
--- 1,7 ----
+ <dl>
+ <dt><label for="answer">{L_QUESTION}:</label><br /><span>{L_QUESTION_EXPLAIN}</span></dt>
+
+ <dd>
+ <input type="text" />
+ </dd>
+ </dl>
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp_demo.html
------------------------------------------------------------------------------
svn:executable = *
Added: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php (added)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php Sat Jul 18 23:37:09 2009
***************
*** 0 ****
--- 1,758 ----
+ <?php
+ /**
+ *
+ * @package VC
+ * @version $Id: captcha_abstract.php 9709 2009-06-30 14:23:16Z Kellanved $
+ * @copyright (c) 2006, 2008 phpBB Group
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ *
+ */
+
+ /**
+ * @ignore
+ */
+ if (!defined('IN_PHPBB'))
+ {
+ exit;
+ }
+
+ global $table_prefix;
+ define('QUESTIONS_TABLE', $table_prefix . 'captcha_questions');
+ define('ANSWERS_TABLE', $table_prefix . 'captcha_answers');
+ define('QA_CONFIRM_TABLE', $table_prefix . 'qa_confirm');
+
+
+
+ /**
+ * QA CAPTCHA sample implementation
+ *
+ * @package VC
+ */
+ class phpbb_captcha_qa
+ {
+ var $confirm_id;
+ var $confirm_code;
+ var $answer;
+ var $question_ids;
+ var $question_text;
+ var $question_lang;
+ var $question_strict;
+ var $attempts = 0;
+ var $type;
+ var $solved = 0;
+ var $captcha_vars = false;
+
+ function init($type)
+ {
+ global $config, $db, $user;
+
+ $user->add_lang('captcha_qa');
+ // read input
+ $this->confirm_id = request_var('confirm_id', '');
+ $this->answer = request_var('answer', '');
+
+ $this->type = (int) $type;
+ $this->question_lang = $user->data['user_lang'];
+
+ $sql = 'SELECT question_id FROM ' . QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($user->data['user_lang']) . '\'';
+ $result = $db->sql_query($sql, 3600);
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $this->question_ids[$row['question_id']] = $row['question_id'];
+ }
+ $db->sql_freeresult($result);
+ if (!sizeof($this->question_ids))
+ {
+ $this->question_lang = $config['default_lang'];
+ $sql = 'SELECT question_id FROM ' . QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($config['default_lang']) . '\'';
+ $result = $db->sql_query($sql, 7200);
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $this->question_ids[$row['question_id']] = $row['question_id'];
+ }
+ $db->sql_freeresult($result);
+ }
+
+ if (!strlen($this->confirm_id) || !$this->load_answer())
+ {
+ // we have no confirm ID, better get ready to display something
+ $this->select_question();
+ }
+ }
+
+
+ function &get_instance()
+ {
+ $instance =& new phpbb_captcha_qa();
+ return $instance;
+ }
+
+
+ function is_installed()
+ {
+ global $db, $phpbb_root_path, $phpEx;
+
+ if (!class_exists('phpbb_db_tools'))
+ {
+ include("$phpbb_root_path/includes/db/db_tools.$phpEx");
+ }
+ $db_tool = new phpbb_db_tools($db);
+ if (!$db_tool->sql_table_exists(QUESTIONS_TABLE))
+ {
+ return false;
+ }
+ }
+
+ function is_available()
+ {
+ global $config, $db, $phpbb_root_path, $phpEx, $user;
+
+ $user->add_lang('captcha_qa');
+
+ if (self::is_installed())
+ {
+ return false;
+ }
+ $sql = 'SELECT COUNT(question_id) as count FROM ' . QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($config['default_lang']) . '\'';
+ $result = $db->sql_query($sql);
+ $row = $db->sql_fetchrow($result);
+ $db->sql_freeresult($result);
+ return ((bool) $row['count']);
+ }
+
+ function get_name()
+ {
+ return 'CAPTCHA_QA';
+ }
+
+ function get_class_name()
+ {
+ return 'phpbb_captcha_qa';
+ }
+
+
+ function execute_demo()
+ {
+ }
+
+ function execute()
+ {
+ }
+
+ function get_template()
+ {
+ global $config, $user, $template, $phpEx, $phpbb_root_path;
+
+ $template->assign_vars(array(
+ 'CONFIRM_QUESTION' => $this->question_text,
+ 'CONFIRM_ID' => $this->confirm_id,
+ 'S_CONFIRM_CODE' => true,
+ 'S_TYPE' => $this->type,
+ ));
+
+ return 'captcha_qa.html';
+ }
+
+ function get_demo_template($id)
+ {
+ return 'captcha_qa_acp_demo.html';
+ }
+
+ function get_hidden_fields()
+ {
+ $hidden_fields = array();
+
+ // this is required - otherwise we would forget about the captcha being already solved
+ if ($this->solved)
+ {
+ $hidden_fields['answer'] = $this->answer;
+ }
+ $hidden_fields['confirm_id'] = $this->confirm_id;
+ return $hidden_fields;
+ }
+
+ function garbage_collect($type)
+ {
+ global $db, $config;
+
+ $sql = 'SELECT DISTINCT c.session_id
+ FROM ' . QA_CONFIRM_TABLE . ' c
+ LEFT JOIN ' . SESSIONS_TABLE . ' s ON (c.session_id = s.session_id)
+ WHERE s.session_id IS NULL' .
+ ((empty($type)) ? '' : ' AND c.confirm_type = ' . (int) $type);
+ $result = $db->sql_query($sql);
+
+ if ($row = $db->sql_fetchrow($result))
+ {
+ $sql_in = array();
+ do
+ {
+ $sql_in[] = (string) $row['session_id'];
+ }
+ while ($row = $db->sql_fetchrow($result));
+
+ if (sizeof($sql_in))
+ {
+ $sql = 'DELETE FROM ' . QA_CONFIRM_TABLE . '
+ WHERE ' . $db->sql_in_set('session_id', $sql_in);
+ $db->sql_query($sql);
+ }
+ }
+ $db->sql_freeresult($result);
+ }
+
+ function uninstall()
+ {
+ $this->garbage_collect(0);
+ }
+
+ function install()
+ {
+ global $db, $phpbb_root_path, $phpEx;
+
+ if (!class_exists('phpbb_db_tools'))
+ {
+ include("$phpbb_root_path/includes/db/db_tools.$phpEx");
+ }
+ $db_tool = new phpbb_db_tools($db);
+ $tables = array(QUESTIONS_TABLE, ANSWERS_TABLE, QA_CONFIRM_TABLE);
+
+ $schemas = array(
+ QUESTIONS_TABLE => array (
+ 'COLUMNS' => array(
+ 'question_id' => array('UINT', Null, 'auto_increment'),
+ 'strict' => array('BOOL', 0),
+ 'lang_id' => array('UINT', 0),
+ 'lang_iso' => array('VCHAR:30', 0),
+ 'question_text' => array('TEXT', 0),
+ ),
+ 'PRIMARY_KEY' => 'question_id',
+ 'KEYS' => array(
+ 'question_id' => array('INDEX', array('question_id', 'language_iso')),
+ ),
+ ),
+ ANSWERS_TABLE => array (
+ 'COLUMNS' => array(
+ 'question_id' => array('UINT', 0),
+ 'answer_text' => array('TEXT', 0),
+ ),
+ 'KEYS' => array(
+ 'question_id' => array('INDEX', 'question_id'),
+ ),
+ ),
+ QA_CONFIRM_TABLE => array (
+ 'COLUMNS' => array(
+ 'session_id' => array('CHAR:32', ''),
+ 'confirm_id' => array('CHAR:32', ''),
+ 'lang_iso' => array('VCHAR:30', 0),
+ 'question_id' => array('UINT', 0),
+ 'attempts' => array('UINT', 0),
+ 'confirm_type' => array('USINT', 0),
+ ),
+ 'KEYS' => array(
+ 'confirm_id' => array('INDEX', 'confirm_id'),
+ 'lookup' => array('INDEX', array('confirm_id', 'session_id', 'lang_iso')),
+ ),
+ 'PRIMARY_KEY' => 'confirm_id',
+ ),
+ );
+
+
+ foreach($schemas as $table => $schema)
+ {
+ if (!$db_tool->sql_table_exists($table))
+ {
+ $db_tool->sql_create_table($table, $schema);
+ }
+ }
+ }
+
+
+ function validate()
+ {
+ global $config, $db, $user;
+
+ $error = '';
+ if (!$this->confirm_id)
+ {
+ $error = $user->lang['CONFIRM_QUESTION_WRONG'];
+ }
+ else
+ {
+ if ($this->check_answer())
+ {
+ // $this->delete_code(); commented out to allow posting.php to repeat the question
+ $this->solved = true;
+ }
+ else
+ {
+ $error = $user->lang['CONFIRM_QUESTION_WRONG'];
+ }
+ }
+
+ if (strlen($error))
+ {
+ // okay, incorrect answer. Let's ask a new question.
+ $this->new_attempt();
+ return $error;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ /**
+ * Select a question
+ */
+ function select_question()
+ {
+ global $db, $user;
+
+ $this->confirm_id = md5(unique_id($user->ip));
+ $this->question = (int) array_rand($this->question_ids);
+
+ $sql = 'INSERT INTO ' . QA_CONFIRM_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+ 'confirm_id' => (string) $this->confirm_id,
+ 'session_id' => (string) $user->session_id,
+ 'lang_iso' => (string) $this->question_lang,
+ 'confirm_type' => (int) $this->type,
+ 'question_id' => (int) $this->question,
+ ));
+ $db->sql_query($sql);
+ $this->load_answer();
+
+ }
+
+ /**
+ * New Question, if desired.
+ */
+ function reselect_question()
+ {
+ global $db, $user;
+
+ $this->question = (int) array_rand($this->question_ids);
+ $this->solved = 0;
+ // compute $seed % 0x7fffffff
+
+ $sql = 'UPDATE ' . QA_CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
+ 'question' => (int) $this->question,)) . '
+ WHERE
+ confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\'
+ AND session_id = \'' . $db->sql_escape($user->session_id) . '\'';
+ $db->sql_query($sql);
+ $this->load_answer();
+ }
+
+ /**
+ * New Question, if desired.
+ */
+ function new_attempt()
+ {
+ global $db, $user;
+
+ $this->question = (int) array_rand($this->question_ids);
+ $this->solved = 0;
+ // compute $seed % 0x7fffffff
+
+ $sql = 'UPDATE ' . QA_CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
+ 'question_id' => (int) $this->question)) . ',
+ attempts = attempts + 1
+ WHERE
+ confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\'
+ AND session_id = \'' . $db->sql_escape($user->session_id) . '\'';
+ $db->sql_query($sql);
+ $this->load_answer();
+ }
+
+ /**
+ * Look up everything we need.
+ */
+ function load_answer()
+ {
+ global $db, $user;
+
+ $sql = 'SELECT con.question_id, attempts, question_text, strict
+ FROM ' . QA_CONFIRM_TABLE . ' con, ' . QUESTIONS_TABLE . " qes
+ WHERE con.question_id = qes.question_id
+ AND confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
+ AND session_id = '" . $db->sql_escape($user->session_id) . "'
+ AND qes.lang_iso = '" . $db->sql_escape($this->question_lang) . "'
+ AND confirm_type = " . $this->type;
+ $result = $db->sql_query($sql);
+ $row = $db->sql_fetchrow($result);
+ $db->sql_freeresult($result);
+
+ if ($row)
+ {
+ $this->question = $row['question_id'];
+
+ $this->attempts = $row['attempts'];
+ $this->question_strict = $row['strict'];
+ $this->question_text = $row['question_text'];
+ return true;
+ }
+ return false;
+ }
+
+ function check_answer()
+ {
+ global $db;
+
+ $answer = ($this->question_strict) ? request_var('answer', '') : utf8_clean_string(request_var('answer', ''));
+
+ $sql = 'SELECT answer_text
+ FROM ' . ANSWERS_TABLE . '
+ WHERE question_id = ' . (int) $this->question;
+ $result = $db->sql_query($sql);
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $solution = ($this->question_strict) ? $row['answer_text'] : utf8_clean_string($row['answer_text'] );
+ if ($solution === $answer)
+ {
+ $this->solved = true;
+ break;
+ }
+ }
+ $db->sql_freeresult($result);
+ return $this->solved;
+ }
+
+ function delete_code()
+ {
+ global $db, $user;
+
+ $sql = 'DELETE FROM ' . QA_CONFIRM_TABLE . "
+ WHERE confirm_id = '" . $db->sql_escape($confirm_id) . "'
+ AND session_id = '" . $db->sql_escape($user->session_id) . "'
+ AND confirm_type = " . $this->type;
+ $db->sql_query($sql);
+ }
+
+ function get_attempt_count()
+ {
+ return $this->attempts;
+ }
+
+ function reset()
+ {
+ global $db, $user;
+
+ $sql = 'DELETE FROM ' . QA_CONFIRM_TABLE . "
+ WHERE session_id = '" . $db->sql_escape($user->session_id) . "'
+ AND confirm_type = " . (int) $this->type;
+ $db->sql_query($sql);
+
+ // we leave the class usable by generating a new question
+ $this->generate_code();
+ }
+
+ function is_solved()
+ {
+ if (request_var('answer', false) && $this->solved === 0)
+ {
+ $this->validate();
+ }
+ return (bool) $this->solved;
+ }
+
+ function acp_page($id, &$module)
+ {
+ global $db, $user, $auth, $template;
+ global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
+
+ $user->add_lang('acp/board');
+ $user->add_lang('captcha_qa');
+
+ if (!$this->is_installed())
+ {
+ $this->install();
+ }
+ $module->tpl_name = 'captcha_qa_acp';
+ $module->page_title = 'ACP_VC_SETTINGS';
+ $form_key = 'acp_captcha';
+ add_form_key($form_key);
+
+ $submit = request_var('submit', false);
+ $question_id = request_var('question_id', 0);
+ $action = request_var('action', '');
+
+
+ $template->assign_vars(array(
+ 'U_ACTION' => $module->u_action,
+ 'QUESTION_ID' => $question_id ,
+ 'CLASS' => $this->get_class_name(),
+ ));
+
+ if (!$question_id && $action != 'add')
+ {
+ $this->acp_question_list($module);
+ }
+ else if ($question_id && $action == 'delete')
+ {
+ if (confirm_box(true))
+ {
+ $this->acp_delete_question($question_id);
+ trigger_error($user->lang['QUESTION_DELETED'] . adm_back_link($module->u_action));
+ }
+ else
+ {
+ confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
+ 'question_id' => $question_id,
+ 'action' => $action,
+ 'configure' => 1,
+ 'select_captcha' => $this->get_class_name(),
+ ))
+ );
+ }
+ }
+ else
+ {
+
+ $error = false;
+ $input_question = request_var('question_text', '');
+ $input_answers = request_var('answers', '');
+ $input_lang = request_var('lang_iso', '');
+ $input_strict = request_var('strict', false);
+ $langs = $this->get_languages();
+ foreach ($langs as $lang => $entry)
+ {
+ $template->assign_block_vars('langs', array(
+ 'ISO' => $lang,
+ 'NAME' => $entry['name'],
+ ));
+ }
+
+ if ($question_id)
+ {
+ if ($question = $this->acp_get_question_data($question_id))
+ {
+ $answers = (isset($input_answers[$lang])) ? $input_answers[$lang] : implode("\n", $question['answers']);
+ $template->assign_vars(array(
+ 'QUESTION_TEXT' => ($input_question) ? $input_question : $question['question_text'],
+ 'LANG_ISO' => ($input_lang) ? $input_lang : $question['lang_iso'],
+ 'STRICT' => (isset($_REQUEST['strict'])) ? $input_strict : $question['strict'],
+ 'ANSWERS' => $answers,
+ ));
+ }
+ else
+ {
+ trigger_error($user->lang['FORM_INVALID'] . adm_back_link($module->u_action));
+ }
+ }
+ else
+ {
+
+ $template->assign_vars(array(
+ 'QUESTION_TEXT' => $input_question,
+ 'LANG_ISO' => $input_lang,
+ 'STRICT' => $input_strict,
+ 'ANSWERS' => $input_answers,
+ ));
+ }
+
+ if ($submit && check_form_key($form_key))
+ {
+ $data = $this->acp_get_question_input();
+ if (!$this->validate_input($data))
+ {
+ $template->assign_vars(array(
+ 'S_ERROR' => true,
+ ));
+ }
+ else
+ {
+ if ($question_id)
+ {
+ $this->acp_update_question($data, $question_id);
+ }
+ else
+ {
+ $this->acp_add_question($data);
+ }
+
+ trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($module->u_action . "&configure=1&select_captcha=" . $this->get_class_name()));
+ }
+ }
+ else if ($submit)
+ {
+ trigger_error($user->lang['FORM_INVALID'] . adm_back_link($module->u_action));
+ }
+ }
+ }
+
+ function acp_question_list(&$module)
+ {
+ global $db, $template;
+
+ $sql = 'SELECT * FROM ' . QUESTIONS_TABLE . ' WHERE 1';
+ $result = $db->sql_query($sql);
+ $template->assign_vars(array(
+ 'S_LIST' => true,
+ ));
+
+ while($row = $db->sql_fetchrow($result))
+ {
+ $url = $module->u_action . "&question_id={$row['question_id']}&configure=1&select_captcha=" . $this->get_class_name() . "&";
+
+ $template->assign_block_vars('questions', array(
+ 'QUESTION_TEXT' => $row['question_text'],
+ 'QUESTION_ID' => $row['question_id'],
+ 'QUESTION_LANG' => $row['lang_iso'],
+ 'U_DELETE' => "{$url}action=delete",
+ 'U_EDIT' => "{$url}action=edit",
+ ));
+ }
+ $db->sql_freeresult($result);
+ }
+
+ function acp_get_question_data($question_id)
+ {
+ global $db;
+
+
+ if ($question_id)
+ {
+ $sql = 'SELECT * FROM ' . QUESTIONS_TABLE . ' WHERE question_id = ' . $question_id;
+ $result = $db->sql_query($sql);
+ if ($row = $db->sql_fetchrow($result))
+ {
+ $question = $row;
+ }
+ else
+ {
+ $db->sql_freeresult($result);
+ return false;
+ }
+ $question['answers'] = array();
+ $sql = 'SELECT * FROM ' . ANSWERS_TABLE . ' WHERE question_id = ' . $question_id;
+ $result = $db->sql_query($sql);
+ while($row = $db->sql_fetchrow($result))
+ {
+ $question['answers'][] = $row['answer_text'];
+ }
+ $db->sql_freeresult($result);
+ return $question;
+ }
+
+ }
+
+
+ function acp_get_question_input()
+ {
+ global $db;
+
+ $question = array(
+ 'question_text' => request_var('question_text', ''),
+ 'strict' => request_var('strict', false),
+ 'lang_iso' => request_var('lang_iso', ''),
+ 'answers' => explode("\n", request_var('answers', '')),
+ );
+
+ return $question;
+ }
+
+
+
+ function acp_update_question($data, $question_id)
+ {
+ global $db;
+
+ $sql = "DELETE FROM " . ANSWERS_TABLE . " WHERE question_id = $question_id";
+ $db->sql_query($sql);
+ $langs = $this->get_languages();
+ $question_ary = $data;
+ $question_ary['lang_id'] = $langs[$question_ary['lang_iso']]['id'];
+ unset($question_ary['answers']);
+ $sql = "UPDATE " . QUESTIONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $question_ary) . "
+ WHERE question_id = $question_id";
+ $db->sql_query($sql);
+ $this->acp_insert_answers($data, $question_id);
+ }
+
+ function acp_add_question($data)
+ {
+ global $db;
+
+ $langs = $this->get_languages();
+ $question_ary = $data;
+
+ $question_ary['lang_id'] = $langs[$data['lang_iso']]['id'];
+ unset($question_ary['answers']);
+ $sql = "INSERT INTO " . QUESTIONS_TABLE . $db->sql_build_array('INSERT', $question_ary);
+ $db->sql_query($sql);
+ $question_id = $db->sql_nextid();
+ $this->acp_insert_answers($data, $question_id);
+ }
+
+ function acp_insert_answers($data, $question_id)
+ {
+ global $db;
+
+ foreach($data['answers'] as $answer)
+ {
+ $answer_ary = array(
+ 'question_id' => $question_id,
+ 'answer_text' => $answer,
+ );
+ $sql = "INSERT INTO " . ANSWERS_TABLE . $db->sql_build_array('INSERT', $answer_ary);
+ $db->sql_query($sql);
+ }
+ }
+
+
+
+ function acp_delete_question($question_id)
+ {
+ global $db;
+
+ $tables = array(QUESTIONS_TABLE, ANSWERS_TABLE);
+ foreach($tables as $table)
+ {
+ $sql = "DELETE FROM $table WHERE question_id = $question_id";
+ $db->sql_query($sql);
+ }
+ }
+
+
+ function validate_input($question_data)
+ {
+ $langs = $this->get_languages();
+ if (!isset($question_data['lang_iso']) ||
+ !isset($question_data['question_text']) ||
+ !isset($question_data['strict']) ||
+ !isset($question_data['answers']))
+ {
+ return false;
+ }
+ if (!isset($langs[$question_data['lang_iso']]) ||
+ !$question_data['question_text'] ||
+ !sizeof($question_data['answers']))
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ function get_languages()
+ {
+ global $db;
+
+ $langs = array();
+ $sql = 'SELECT * FROM ' . LANG_TABLE . ' WHERE 1';
+ $result = $db->sql_query($sql);
+ while($row = $db->sql_fetchrow($result))
+ {
+ $langs[$row['lang_iso']] = array(
+ 'name' => $row['lang_local_name'],
+ 'id' => $row['lang_id'],
+ );
+ }
+ $db->sql_freeresult($result);
+ return $langs;
+ }
+
+ }
+
+ ?>
\ No newline at end of file
Propchange: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
------------------------------------------------------------------------------
svn:executable = *
Added: branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php (added)
--- branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php Sat Jul 18 23:37:09 2009
***************
*** 0 ****
--- 1,61 ----
+ <?php
+ /**
+ *
+ * recaptcha [English]
+ *
+ * @package language
+ * @version $Id: recaptcha.php 9709 2009-06-30 14:23:16Z Kellanved $
+ * @copyright (c) 2008 phpBB Group
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ *
+ */
+
+ /**
+ * DO NOT CHANGE
+ */
+ if (!defined('IN_PHPBB'))
+ {
+ exit;
+ }
+
+ if (empty($lang) || !is_array($lang))
+ {
+ $lang = array();
+ }
+
+ // DEVELOPERS PLEASE NOTE
+ //
+ // All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+ //
+ // Placeholders can now contain order information, e.g. instead of
+ // 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+ // translators to re-order the output of data while ensuring it remains correct
+ //
+ // You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+ // equally where a string contains only two placeholders which are used to wrap text
+ // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+
+ $lang = array_merge($lang, array(
+ 'CAPTCHA_QA' => 'Q&A CAPTCHA',
+ 'CONFIRM_QUESTION_EXPLAIN' => 'Please answer this question to avoid automatted registrations.',
+ 'CONFIRM_QUESTION_WRONG' => 'The answer to the confirmation question was not recognized.',
+
+ 'QUESTION_ANSWERS' => 'Answers',
+ 'ANSWERS_EXPLAIN' => 'The Answers. Please write one answer per line.',
+ 'QUESTIONS' => 'Questions',
+ 'QUESTIONS_EXPLAIN' => 'Here you can add enter and edit questions to be asked on registration to ward against automatted installs.',
+ 'QUESTION_DELETED' => 'Question deleted',
+ 'QUESTION_LANG' => 'Language',
+ 'QUESTION_LANG_EXPLAIN' => 'The language this question and its answers is written in.',
+ 'QUESTION_STRICT' => 'Strict check',
+ 'QUESTION_STRICT_EXPLAIN' => 'If enabled, the check also recognizes capitalization and whitespaces.',
+
+ 'QUESTION_TEXT' => 'Question',
+ 'QUESTION_TEXT_EXPLAIN' => 'The question that will be asked on registration.',
+
+ 'QA_ERROR_MSG' => 'Please fill out all fields and enter at least one answer.',
+
+
+ ));
+
+ ?>
\ No newline at end of file
Propchange: branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php
------------------------------------------------------------------------------
svn:executable = *
Added: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html (added)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html Sat Jul 18 23:37:09 2009
***************
*** 0 ****
--- 1,23 ----
+ <!-- IF S_TYPE == 1 -->
+ <div class="panel">
+ <div class="inner"><span class="corners-top"><span></span></span>
+
+ <h3>{L_CONFIRMATION}</h3>
+ <fieldset class="fields2">
+
+ <!-- ENDIF -->
+
+ <dl>
+ <dt><label>{CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
+ <dd>
+ <input type="text" tabindex="10" name="answer" id="answer" size="25" value="{USERNAME}" class="inputbox autowidth" title="{L_ANSWER}" />
+ <input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" />
+ </dd>
+ </dl>
+
+ <!-- IF S_TYPE == 1 -->
+ </fieldset>
+ <span class="corners-bottom"><span></span></span></div>
+ </div>
+ <!-- ENDIF -->
+
Propchange: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html
------------------------------------------------------------------------------
svn:executable = *
Added: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_qa.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_qa.html (added)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_qa.html Sat Jul 18 23:37:09 2009
***************
*** 0 ****
--- 1,5 ----
+ <tr>
+ <td class="row1"><b class="genmed">{CONFIRM_QUESTION}: </b><br /></td>
+ <td class="row2"><input class="post" type="text" name="answer" size="80" /></td>
+ <input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></td>
+ </tr>
\ No newline at end of file
Propchange: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_qa.html
------------------------------------------------------------------------------
svn:executable = *
|
|
From: Henry S. <kel...@ph...> - 2009-07-18 23:41:07
|
Author: Kellanved
Date: Sat Jul 18 23:39:45 2009
New Revision: 9787
Log:
Initial commit for the QA captcha. Needs language & style finetuning and bug searching & fixing
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html (props changed)
branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp_demo.html (props changed)
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php (props changed)
branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php (props changed)
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html (props changed)
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_qa.html (props changed)
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html
------------------------------------------------------------------------------
*** svn:executable (original)
--- svn:executable (removed)
***************
*** 1 ****
- *
--- 0 ----
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp_demo.html
------------------------------------------------------------------------------
*** svn:executable (original)
--- svn:executable (removed)
***************
*** 1 ****
- *
--- 0 ----
Propchange: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
------------------------------------------------------------------------------
*** svn:executable (original)
--- svn:executable (removed)
***************
*** 1 ****
- *
--- 0 ----
Propchange: branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php
------------------------------------------------------------------------------
*** svn:executable (original)
--- svn:executable (removed)
***************
*** 1 ****
- *
--- 0 ----
Propchange: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html
------------------------------------------------------------------------------
*** svn:executable (original)
--- svn:executable (removed)
***************
*** 1 ****
- *
--- 0 ----
Propchange: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_qa.html
------------------------------------------------------------------------------
*** svn:executable (original)
--- svn:executable (removed)
***************
*** 1 ****
- *
--- 0 ----
|
|
From: Chris S. <too...@ph...> - 2009-07-18 23:29:58
|
Author: toonarmy
Date: Sat Jul 18 23:29:25 2009
New Revision: 9785
Log:
Ensure user errors are displayed regardless of PHP settings. #47505
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 Jul 18 23:29:25 2009
***************
*** 163,168 ****
--- 163,169 ----
<li>[Fix] Add hard limit for smilies.</li>
<li>[Fix] Remove redundant SQL query from ucp.php. (Bug #40305)</li>
<li>[Fix] Reorder frame order of animated subsilver2 topic icons to be useful when animation is disabled. (Bug #29385 - Patch by prototech)</li>
+ <li>[Fix] Ensure user errors are displayed regardless of PHP settings. (Bug #47505)</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 Jul 18 23:29:25 2009
***************
*** 3295,3301 ****
global $phpEx, $phpbb_root_path, $msg_title, $msg_long_text;
// Do not display notices if we suppress them via @
! if (error_reporting() == 0)
{
return;
}
--- 3295,3301 ----
global $phpEx, $phpbb_root_path, $msg_title, $msg_long_text;
// Do not display notices if we suppress them via @
! if (error_reporting() == 0 && $errno != E_USER_ERROR && $errno != E_USER_WARNING && $errno != E_USER_NOTICE)
{
return;
}
|
|
From: Marek R. <ap...@ph...> - 2009-07-18 23:15:59
|
Author: aptx
Date: Sat Jul 18 23:15:25 2009
New Revision: 9784
Log:
#47665
Modified:
branches/phpBB-3_0_0/phpBB/language/en/ucp.php
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 Sat Jul 18 23:15:25 2009
***************
*** 423,429 ****
'UCP_MAIN_FRONT' => 'Front page',
'UCP_MAIN_SUBSCRIBED' => 'Manage subscriptions',
! 'UCP_MSNM' => 'MSN Messenger',
'UCP_NO_ATTACHMENTS' => 'You have posted no files.',
'UCP_PREFS' => 'Board preferences',
--- 423,429 ----
'UCP_MAIN_FRONT' => 'Front page',
'UCP_MAIN_SUBSCRIBED' => 'Manage subscriptions',
! 'UCP_MSNM' => 'WL/MSN Messenger',
'UCP_NO_ATTACHMENTS' => 'You have posted no files.',
'UCP_PREFS' => 'Board preferences',
|
|
From: Chris S. <too...@ph...> - 2009-07-18 21:20:59
|
Author: toonarmy
Date: Sat Jul 18 21:20:20 2009
New Revision: 9783
Log:
Fix #45315
Modified:
branches/phpBB-3_0_0/phpBB/includes/auth/auth_ldap.php
Modified: branches/phpBB-3_0_0/phpBB/includes/auth/auth_ldap.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/auth/auth_ldap.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/auth/auth_ldap.php Sat Jul 18 21:20:20 2009
***************
*** 281,287 ****
$filter = '(' . $config['ldap_uid'] . '=' . ldap_escape(htmlspecialchars_decode($username)) . ')';
if ($config['ldap_user_filter'])
{
! $filter = "(&$filter({$config['ldap_user_filter']}))";
}
return $filter;
}
--- 281,288 ----
$filter = '(' . $config['ldap_uid'] . '=' . ldap_escape(htmlspecialchars_decode($username)) . ')';
if ($config['ldap_user_filter'])
{
! $_filter = ($config['ldap_user_filter'][0] == '(' && substr($config['ldap_user_filter'], -1) == ')') ? $config['ldap_user_filter'] : "({$config['ldap_user_filter']})";
! $filter = "(&{$filter}{$_filter})";
}
return $filter;
}
|
|
From: Marek R. <ap...@ph...> - 2009-07-18 20:46:32
|
Author: aptx
Date: Sat Jul 18 20:45:36 2009
New Revision: 9782
Log:
- Remove user's password from email templates.
Modified:
branches/phpBB-3_0_0/phpBB/language/en/email/admin_welcome_inactive.txt
branches/phpBB-3_0_0/phpBB/language/en/email/coppa_welcome_inactive.txt
branches/phpBB-3_0_0/phpBB/language/en/email/installed.txt
branches/phpBB-3_0_0/phpBB/language/en/email/user_welcome.txt
branches/phpBB-3_0_0/phpBB/language/en/email/user_welcome_inactive.txt
Modified: branches/phpBB-3_0_0/phpBB/language/en/email/admin_welcome_inactive.txt
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/email/admin_welcome_inactive.txt (original)
--- branches/phpBB-3_0_0/phpBB/language/en/email/admin_welcome_inactive.txt Sat Jul 18 20:45:36 2009
***************
*** 6,12 ****
----------------------------
Username: {USERNAME}
- Password: {PASSWORD}
Board URL: {U_BOARD}
----------------------------
--- 6,11 ----
Modified: branches/phpBB-3_0_0/phpBB/language/en/email/coppa_welcome_inactive.txt
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/email/coppa_welcome_inactive.txt (original)
--- branches/phpBB-3_0_0/phpBB/language/en/email/coppa_welcome_inactive.txt Sat Jul 18 20:45:36 2009
***************
*** 16,22 ****
Permission to participate at "{SITENAME}" - {U_BOARD}
Username: {USERNAME}
- Password: {PASSWORD}
E-mail: {EMAIL_ADDRESS}
I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO "{SITENAME}" TO STORE THIS INFORMATION.
--- 16,21 ----
Modified: branches/phpBB-3_0_0/phpBB/language/en/email/installed.txt
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/email/installed.txt (original)
--- branches/phpBB-3_0_0/phpBB/language/en/email/installed.txt Sat Jul 18 20:45:36 2009
***************
*** 8,14 ****
----------------------------
Username: {USERNAME}
- Password: {PASSWORD}
Board URL: {U_BOARD}
----------------------------
--- 8,13 ----
Modified: branches/phpBB-3_0_0/phpBB/language/en/email/user_welcome.txt
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/email/user_welcome.txt (original)
--- branches/phpBB-3_0_0/phpBB/language/en/email/user_welcome.txt Sat Jul 18 20:45:36 2009
***************
*** 6,12 ****
----------------------------
Username: {USERNAME}
- Password: {PASSWORD}
Board URL: {U_BOARD}
----------------------------
--- 6,11 ----
Modified: branches/phpBB-3_0_0/phpBB/language/en/email/user_welcome_inactive.txt
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/email/user_welcome_inactive.txt (original)
--- branches/phpBB-3_0_0/phpBB/language/en/email/user_welcome_inactive.txt Sat Jul 18 20:45:36 2009
***************
*** 6,12 ****
----------------------------
Username: {USERNAME}
- Password: {PASSWORD}
Board URL: {U_BOARD}
----------------------------
--- 6,11 ----
|
|
From: Jim W. <ter...@ph...> - 2009-07-18 19:21:18
|
Author: terrafrost
Date: Sat Jul 18 19:19:38 2009
New Revision: 9781
Log:
- added ability to filter logs by log_operation
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/acp_logs.html
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php
branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_logs.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_logs.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_logs.html Sat Jul 18 19:19:38 2009
***************
*** 8,19 ****
<form id="list" method="post" action="{U_ACTION}">
<!-- IF PAGINATION -->
! <div class="pagination">
<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span>
</div>
<!-- ENDIF -->
<!-- IF .log -->
<table cellspacing="1">
<thead>
--- 8,25 ----
<form id="list" method="post" action="{U_ACTION}">
+ <fieldset class="display-options" style="float: left">
+ {L_SELECT_LANG_KEY}: <select name="log_operation">{S_LANG_KEYS}</select> <input type="submit" class="button2" name="filter" value="{L_FILTER}" />
+ </fieldset>
+
<!-- IF PAGINATION -->
! <div class="pagination" style="float: right; margin: 15px 0 2px 0">
<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span>
</div>
<!-- ENDIF -->
+ <div class="clearfix"> </div><br style="clear: both;" />
+
<!-- IF .log -->
<table cellspacing="1">
<thead>
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Sat Jul 18 19:19:38 2009
***************
*** 209,214 ****
--- 209,215 ----
<li>[Feature] Add option to disable remote upload avatars (Bug #45375 - Patch by nickvergessen)</li>
<li>[Feature] Ability to delete warnings and keep warnings permanently (Bug #43375 - Patch by nickvergessen)</li>
<li>[Feature] Ability to empty a user's outbox from the user ACP quick tools.</li>
+ <li>[Feature] Ability to filter ACP logs</li>
</ul>
<a name="v304"></a><h3>1.ii. Changes since 3.0.4</h3>
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php Sat Jul 18 19:19:38 2009
***************
*** 104,109 ****
--- 104,168 ----
$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
+ $log_operation = request_var('log_operation', '');
+ $s_lang_keys = '<option value="">' . $user->lang['SHOW_ALL_OPERATIONS'] . '</option>';
+
+ switch ($mode)
+ {
+ case 'admin':
+ $log_type = LOG_ADMIN;
+ $sql_forum = '';
+ break;
+
+ case 'mod':
+ $log_type = LOG_MOD;
+
+ if ($topic_id)
+ {
+ $sql_forum = 'AND topic_id = ' . intval($topic_id);
+ }
+ else if (is_array($forum_id))
+ {
+ $sql_forum = 'AND ' . $db->sql_in_set('forum_id', array_map('intval', $forum_id));
+ }
+ else
+ {
+ $sql_forum = ($forum_id) ? 'AND forum_id = ' . intval($forum_id) : '';
+ }
+ break;
+
+ case 'user':
+ $log_type = LOG_USERS;
+ $sql_forum = 'AND reportee_id = ' . (int) $user_id;
+ break;
+
+ case 'users':
+ $log_type = LOG_USERS;
+ $sql_forum = '';
+ break;
+
+ case 'critical':
+ $log_type = LOG_CRITICAL;
+ $sql_forum = '';
+ break;
+
+ default:
+ return;
+ }
+
+ $sql = "SELECT DISTINCT log_operation
+ FROM " . LOG_TABLE . "
+ WHERE log_type = $log_type
+ " . (($limit_days) ? "AND log_time >= $sql_where " : ' ') .
+ $sql_forum;
+ $result = $db->sql_query($sql);
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $selected = ($log_operation == $row['log_operation']) ? ' selected="selected"' : '';
+ $s_lang_keys .= '<option value="' . $row['log_operation'] . '"' . $selected . '>' . $user->lang[$row['log_operation']] . '</option>';
+ }
+ $db->sql_freeresult($result);
+
$l_title = $user->lang['ACP_' . strtoupper($mode) . '_LOGS'];
$l_title_explain = $user->lang['ACP_' . strtoupper($mode) . '_LOGS_EXPLAIN'];
***************
*** 123,129 ****
// Grab log data
$log_data = array();
$log_count = 0;
! view_log($mode, $log_data, $log_count, $config['topics_per_page'], $start, $forum_id, 0, 0, $sql_where, $sql_sort);
$template->assign_vars(array(
'L_TITLE' => $l_title,
--- 182,188 ----
// Grab log data
$log_data = array();
$log_count = 0;
! view_log($mode, $log_data, $log_count, $config['topics_per_page'], $start, $forum_id, 0, 0, $sql_where, $sql_sort, $log_operation);
$template->assign_vars(array(
'L_TITLE' => $l_title,
***************
*** 136,141 ****
--- 195,201 ----
'S_LIMIT_DAYS' => $s_limit_days,
'S_SORT_KEY' => $s_sort_key,
'S_SORT_DIR' => $s_sort_dir,
+ 'S_LANG_KEYS' => $s_lang_keys,
'S_CLEARLOGS' => $auth->acl_get('a_clearlogs'),
)
);
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 Jul 18 19:19:38 2009
***************
*** 2278,2284 ****
/**
* View log
*/
! function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $limit_days = 0, $sort_by = 'l.log_time DESC')
{
global $db, $user, $auth, $phpEx, $phpbb_root_path, $phpbb_admin_path;
--- 2278,2284 ----
/**
* View log
*/
! function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $limit_days = 0, $sort_by = 'l.log_time DESC', $log_operation = '')
{
global $db, $user, $auth, $phpEx, $phpbb_root_path, $phpbb_admin_path;
***************
*** 2333,2339 ****
FROM " . LOG_TABLE . " l, " . USERS_TABLE . " u
WHERE l.log_type = $log_type
AND u.user_id = l.user_id
! " . (($limit_days) ? "AND l.log_time >= $limit_days" : '') . "
$sql_forum
ORDER BY $sort_by";
$result = $db->sql_query_limit($sql, $limit, $offset);
--- 2333,2340 ----
FROM " . LOG_TABLE . " l, " . USERS_TABLE . " u
WHERE l.log_type = $log_type
AND u.user_id = l.user_id
! " . (($limit_days) ? "AND l.log_time >= $limit_days" : '') .
! (!empty($log_operation) ? "AND l.log_operation = '" . $db->sql_escape($log_operation) . "'" : '') . "
$sql_forum
ORDER BY $sort_by";
$result = $db->sql_query_limit($sql, $limit, $offset);
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 Jul 18 19:19:38 2009
***************
*** 230,235 ****
--- 230,237 ----
'EXPORT_DOWNLOAD' => 'Download',
'EXPORT_STORE' => 'Store',
+ 'FILTER' => 'Filter',
+
'GENERAL_OPTIONS' => 'General options',
'GENERAL_SETTINGS' => 'General settings',
'GLOBAL_MASK' => 'Global permission mask',
***************
*** 271,276 ****
--- 273,279 ----
'RETURN_TO' => 'Return toâ¦',
'SELECT_ANONYMOUS' => 'Select anonymous user',
+ 'SELECT_LANG_KEY' => 'Select operation',
'SELECT_OPTION' => 'Select option',
'SETTING_TOO_LOW' => 'The entered value for the setting â%1$sâ is too low. The minimal allowed value is %2$d.',
|
|
From: Joas S. <nic...@ph...> - 2009-07-18 13:04:48
|
Author: nickvergessen
Date: Sat Jul 18 13:03:45 2009
New Revision: 9780
Log:
fix r9775
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/viewtopic.php
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 Jul 18 13:03:45 2009
***************
*** 1470,1475 ****
--- 1470,1476 ----
'U_INFO' => ($auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=post_details&f=$forum_id&p=" . $row['post_id'], true, $user->session_id) : '',
'U_DELETE' => (!$user->data['is_registered']) ? '' : ((($user->data['user_id'] == $poster_id && $auth->acl_get('f_delete', $forum_id) && $topic_data['topic_last_post_id'] == $row['post_id'] && !$row['post_edit_locked'] && ($row['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time'])) || $auth->acl_get('m_delete', $forum_id)) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=delete&f=$forum_id&p={$row['post_id']}") : ''),
+ 'U_PROFILE' => $user_cache[$poster_id]['profile'],
'U_SEARCH' => $user_cache[$poster_id]['search'],
'U_PM' => ($poster_id != ANONYMOUS && $config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_cache[$poster_id]['allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&action=quotepost&p=' . $row['post_id']) : '',
'U_EMAIL' => $user_cache[$poster_id]['email'],
|
|
From: Chris S. <too...@ph...> - 2009-07-18 10:27:32
|
Author: toonarmy
Date: Sat Jul 18 10:27:07 2009
New Revision: 9779
Log:
Reorder frame order of animated subsilver2 topic icons to be useful when animation is disabled. #29385
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/imageset/topic_read_hot.gif
branches/phpBB-3_0_0/phpBB/styles/subsilver2/imageset/topic_read_hot_mine.gif
branches/phpBB-3_0_0/phpBB/styles/subsilver2/imageset/topic_unread_hot.gif
branches/phpBB-3_0_0/phpBB/styles/subsilver2/imageset/topic_unread_hot_mine.gif
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Sat Jul 18 10:27:07 2009
***************
*** 162,167 ****
--- 162,168 ----
<li>[Fix] Correct escaping/unescaping in the LDAP authentication plugin. (Bug #48175)</li>
<li>[Fix] Add hard limit for smilies.</li>
<li>[Fix] Remove redundant SQL query from ucp.php. (Bug #40305)</li>
+ <li>[Fix] Reorder frame order of animated subsilver2 topic icons to be useful when animation is disabled. (Bug #29385 - Patch by prototech)</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/styles/subsilver2/imageset/topic_read_hot.gif
==============================================================================
Binary files - no diff available.
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/imageset/topic_read_hot_mine.gif
==============================================================================
Binary files - no diff available.
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/imageset/topic_unread_hot.gif
==============================================================================
Binary files - no diff available.
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/imageset/topic_unread_hot_mine.gif
==============================================================================
Binary files - no diff available.
|
|
From: Chris S. <too...@ph...> - 2009-07-18 10:12:50
|
Author: toonarmy
Date: Sat Jul 18 10:12:17 2009
New Revision: 9778
Log:
Remove redundant SQL query from ucp.php. #40305
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/ucp.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Sat Jul 18 10:12:17 2009
***************
*** 161,166 ****
--- 161,167 ----
<li>[Fix] Hide profile-icon from viewtopic-page if user has no permissions (subsilver2 only) (Bug #37635 - Patch by leviatan21)</li>
<li>[Fix] Correct escaping/unescaping in the LDAP authentication plugin. (Bug #48175)</li>
<li>[Fix] Add hard limit for smilies.</li>
+ <li>[Fix] Remove redundant SQL query from ucp.php. (Bug #40305)</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/ucp.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/ucp.php (original)
--- branches/phpBB-3_0_0/phpBB/ucp.php Sat Jul 18 10:12:17 2009
***************
*** 215,225 ****
$auth->acl_cache($user->data);
- $sql = 'UPDATE ' . USERS_TABLE . "
- SET user_perm_from = 0
- WHERE user_id = " . $user->data['user_id'];
- $db->sql_query($sql);
-
$sql = 'SELECT username
FROM ' . USERS_TABLE . '
WHERE user_id = ' . $user->data['user_perm_from'];
--- 215,220 ----
|
|
From: Chris S. <too...@ph...> - 2009-07-18 10:02:47
|
Author: toonarmy
Date: Sat Jul 18 10:02:06 2009
New Revision: 9777
Log:
#42925
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Sat Jul 18 10:02:06 2009
***************
*** 1164,1170 ****
if (is_numeric($offset))
{
$selected = ($offset == $default) ? ' selected="selected"' : '';
! $tz_select .= '<option title="'.$zone.'" value="' . $offset . '"' . $selected . '>' . $zone_trunc . '</option>';
}
}
--- 1164,1170 ----
if (is_numeric($offset))
{
$selected = ($offset == $default) ? ' selected="selected"' : '';
! $tz_select .= '<option title="' . $zone . '" value="' . $offset . '"' . $selected . '>' . $zone_trunc . '</option>';
}
}
|
|
From: Joas S. <nic...@ph...> - 2009-07-18 09:59:39
|
Author: nickvergessen
Date: Sat Jul 18 09:42:28 2009
New Revision: 9775
Log:
Fix bug #37635 - Hide profile-icon from viewtopic-page if user has no permissions (subsilver2 only) - Patch by leviatan21
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/viewtopic_body.html
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 Jul 18 09:42:28 2009
***************
*** 158,163 ****
--- 158,164 ----
<li>[Fix] Fix "Always show a scrollbar for short pages" for IE8 and Firefox 3.5 (Bug #47865 - Patch by stokerpiller)</li>
<li>[Fix] Do not allow setting group as default group for pending user (Bug #45675 - Patch by nickvergessen)</li>
<li>[Fix] Fail gracefully if store folder is not writable during update. (Bugs #46615, #46945)</li>
+ <li>[Fix] Hide profile-icon from viewtopic-page if user has no permissions (subsilver2 only) (Bug #37635 - Patch by leviatan21)</li>
<li>[Fix] Correct escaping/unescaping in the LDAP authentication plugin. (Bug #48175)</li>
<li>[Fix] Add hard limit for smilies.</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/viewtopic_body.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/viewtopic_body.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/viewtopic_body.html Sat Jul 18 09:42:28 2009
***************
*** 285,291 ****
<!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
<td class="profile"><strong><a href="#wrapheader">{L_BACK_TO_TOP}</a></strong></td>
! <td><div class="gensmall" style="float: {S_CONTENT_FLOW_BEGIN};"> <!-- IF postrow.U_PROFILE --><a href="{postrow.U_PROFILE}">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_PM --><a href="{postrow.U_PM}">{PM_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_EMAIL --><a href="{postrow.U_EMAIL}">{EMAIL_IMG}</a> <!-- ENDIF --> </div> <div class="gensmall" style="float: {S_CONTENT_FLOW_END};"><!-- IF not S_IS_BOT --><!-- IF postrow.U_EDIT --><a href="{postrow.U_EDIT}">{EDIT_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_QUOTE --><a href="{postrow.U_QUOTE}">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- ENDIF --> </div></td>
<!-- ENDIF -->
</tr>
--- 285,291 ----
<!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
<td class="profile"><strong><a href="#wrapheader">{L_BACK_TO_TOP}</a></strong></td>
! <td><div class="gensmall" style="float: {S_CONTENT_FLOW_BEGIN};"> <!-- IF postrow.U_POST_AUTHOR --><a href="{postrow.U_POST_AUTHOR}">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_PM --><a href="{postrow.U_PM}">{PM_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_EMAIL --><a href="{postrow.U_EMAIL}">{EMAIL_IMG}</a> <!-- ENDIF --> </div> <div class="gensmall" style="float: {S_CONTENT_FLOW_END};"><!-- IF not S_IS_BOT --><!-- IF postrow.U_EDIT --><a href="{postrow.U_EDIT}">{EDIT_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_QUOTE --><a href="{postrow.U_QUOTE}">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- ENDIF --> </div></td>
<!-- ENDIF -->
</tr>
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 Jul 18 09:42:28 2009
***************
*** 1470,1476 ****
'U_INFO' => ($auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=post_details&f=$forum_id&p=" . $row['post_id'], true, $user->session_id) : '',
'U_DELETE' => (!$user->data['is_registered']) ? '' : ((($user->data['user_id'] == $poster_id && $auth->acl_get('f_delete', $forum_id) && $topic_data['topic_last_post_id'] == $row['post_id'] && !$row['post_edit_locked'] && ($row['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time'])) || $auth->acl_get('m_delete', $forum_id)) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=delete&f=$forum_id&p={$row['post_id']}") : ''),
- 'U_PROFILE' => $user_cache[$poster_id]['profile'],
'U_SEARCH' => $user_cache[$poster_id]['search'],
'U_PM' => ($poster_id != ANONYMOUS && $config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_cache[$poster_id]['allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&action=quotepost&p=' . $row['post_id']) : '',
'U_EMAIL' => $user_cache[$poster_id]['email'],
--- 1470,1475 ----
|
|
From: Marek R. <ap...@ph...> - 2009-07-18 09:59:35
|
Author: aptx
Date: Sat Jul 18 09:44:03 2009
New Revision: 9776
Log:
- PHP4 compatibility
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Sat Jul 18 09:44:03 2009
***************
*** 3306,3311 ****
--- 3306,3316 ----
$msg_text = $msg_long_text;
}
+ if (!defined('E_DEPRECATED'))
+ {
+ define('E_DEPRECATED', 8192);
+ }
+
switch ($errno)
{
case E_NOTICE:
***************
*** 3481,3486 ****
--- 3486,3496 ----
exit_handler();
break;
+
+ // PHP4 comptibility
+ case E_DEPRECATED:
+ return true;
+ break;
}
// If we notice an error not handled here we pass this back to PHP by returning false
|
7 messages has been excluded from this view by a project administrator.
