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: Ruslan U. <rx...@ph...> - 2009-08-10 12:10:06
|
Author: rxu
Date: Mon Aug 10 13:09:18 2009
New Revision: 9947
Log:
Function approve_post adjustment (migrating to sync())
Authorised by: Kellanved
Modified:
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php Mon Aug 10 13:09:18 2009
***************
*** 491,501 ****
// If Post -> total_posts = total_posts+1, forum_posts = forum_posts+1, topic_replies = topic_replies+1
$total_topics = $total_posts = 0;
! $forum_topics_posts = $topic_approve_sql = $topic_replies_sql = $post_approve_sql = $topic_id_list = $forum_id_list = $approve_log = array();
$user_posts_sql = $post_approved_list = array();
- $update_forum_information = false;
-
foreach ($post_info as $post_id => $post_data)
{
if ($post_data['post_approved'])
--- 491,499 ----
// If Post -> total_posts = total_posts+1, forum_posts = forum_posts+1, topic_replies = topic_replies+1
$total_topics = $total_posts = 0;
! $topic_approve_sql = $post_approve_sql = $topic_id_list = $forum_id_list = $approve_log = array();
$user_posts_sql = $post_approved_list = array();
foreach ($post_info as $post_id => $post_data)
{
if ($post_data['post_approved'])
***************
*** 523,538 ****
{
if ($post_data['forum_id'])
{
- if (!isset($forum_topics_posts[$post_data['forum_id']]))
- {
- $forum_topics_posts[$post_data['forum_id']] = array(
- 'forum_posts' => 0,
- 'forum_topics' => 0
- );
- }
-
$total_topics++;
- $forum_topics_posts[$post_data['forum_id']]['forum_topics']++;
}
$topic_approve_sql[] = $post_data['topic_id'];
--- 521,527 ----
***************
*** 553,596 ****
);
}
- if ($post_data['topic_replies_real'] > 0)
- {
- if (!isset($topic_replies_sql[$post_data['topic_id']]))
- {
- $topic_replies_sql[$post_data['topic_id']] = 0;
- }
- $topic_replies_sql[$post_data['topic_id']]++;
- }
-
if ($post_data['forum_id'])
{
- if (!isset($forum_topics_posts[$post_data['forum_id']]))
- {
- $forum_topics_posts[$post_data['forum_id']] = array(
- 'forum_posts' => 0,
- 'forum_topics' => 0
- );
- }
-
$total_posts++;
- $forum_topics_posts[$post_data['forum_id']]['forum_posts']++;
// Increment by topic_replies if we approve a topic...
// This works because we do not adjust the topic_replies when re-approving a topic after an edit.
if ($post_data['topic_first_post_id'] == $post_id && $post_data['topic_replies'])
{
$total_posts += $post_data['topic_replies'];
- $forum_topics_posts[$post_data['forum_id']]['forum_posts'] += $post_data['topic_replies'];
}
}
$post_approve_sql[] = $post_id;
-
- // If the post is newer than the last post information stored we need to update the forum information
- if ($post_data['post_time'] >= $post_data['forum_last_post_time'])
- {
- $update_forum_information = true;
- }
}
$post_id_list = array_values(array_diff($post_id_list, $post_approved_list));
for ($i = 0, $size = sizeof($post_approved_list); $i < $size; $i++)
--- 542,560 ----
***************
*** 614,650 ****
$db->sql_query($sql);
}
foreach ($approve_log as $log_data)
{
add_log('mod', $log_data['forum_id'], $log_data['topic_id'], ($log_data['type'] == 'topic') ? 'LOG_TOPIC_APPROVED' : 'LOG_POST_APPROVED', $log_data['post_subject']);
}
- if (sizeof($topic_replies_sql))
- {
- foreach ($topic_replies_sql as $topic_id => $num_replies)
- {
- $sql = 'UPDATE ' . TOPICS_TABLE . "
- SET topic_replies = topic_replies + $num_replies
- WHERE topic_id = $topic_id";
- $db->sql_query($sql);
- }
- }
-
- if (sizeof($forum_topics_posts))
- {
- foreach ($forum_topics_posts as $forum_id => $row)
- {
- $sql = 'UPDATE ' . FORUMS_TABLE . '
- SET ';
- $sql .= ($row['forum_topics']) ? "forum_topics = forum_topics + {$row['forum_topics']}" : '';
- $sql .= ($row['forum_topics'] && $row['forum_posts']) ? ', ' : '';
- $sql .= ($row['forum_posts']) ? "forum_posts = forum_posts + {$row['forum_posts']}" : '';
- $sql .= " WHERE forum_id = $forum_id";
-
- $db->sql_query($sql);
- }
- }
-
if (sizeof($user_posts_sql))
{
// Try to minimize the query count by merging users with the same post count additions
--- 578,590 ----
$db->sql_query($sql);
}
+ unset($topic_approve_sql, $post_approve_sql);
+
foreach ($approve_log as $log_data)
{
add_log('mod', $log_data['forum_id'], $log_data['topic_id'], ($log_data['type'] == 'topic') ? 'LOG_TOPIC_APPROVED' : 'LOG_POST_APPROVED', $log_data['post_subject']);
}
if (sizeof($user_posts_sql))
{
// Try to minimize the query count by merging users with the same post count additions
***************
*** 673,686 ****
{
set_config_count('num_posts', $total_posts, true);
}
- unset($topic_approve_sql, $topic_replies_sql, $post_approve_sql);
-
- update_post_information('topic', array_keys($topic_id_list));
! if ($update_forum_information)
! {
! update_post_information('forum', array_keys($forum_id_list));
! }
unset($topic_id_list, $forum_id_list);
$messenger = new messenger();
--- 613,621 ----
{
set_config_count('num_posts', $total_posts, true);
}
! sync('topic', 'topic_id', array_keys($topic_id_list), true);
! sync('forum', 'forum_id', array_keys($forum_id_list), true, true);
unset($topic_id_list, $forum_id_list);
$messenger = new messenger();
|
|
From: Ruslan U. <rx...@ph...> - 2009-08-10 12:07:45
|
Author: rxu
Date: Mon Aug 10 13:07:01 2009
New Revision: 9946
Log:
Fix bug #47705 - Out of range value for column 'topic_replies_real'
Authorised by: Kellanved
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Mon Aug 10 13:07:01 2009
***************
*** 168,173 ****
--- 168,174 ----
<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>[Fix] Fix error with disapproval of topics having several queued posts only. (Bug #47705 - Patch by rxu)</li>
<li>[Fix] Preserve newlines in template files (one newline had been always dropped after a template variable due to PHP's handling of closing tags)</li>
<li>[Fix] Be less strict with FTP daemons when getting directory filelists. (Bug #46295)</li>
<li>[Fix] Fix set_custom_template for database-stored styles (Bug #40515 - Patch by nickvergessen)</li>
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php Mon Aug 10 13:07:01 2009
***************
*** 859,947 ****
if (confirm_box(true))
{
! // If Topic -> forum_topics_real -= 1
! // If Post -> topic_replies_real -= 1
!
! $num_disapproved = 0;
! $forum_topics_real = $topic_id_list = $forum_id_list = $topic_replies_real_sql = $post_disapprove_sql = $disapprove_log = array();
!
foreach ($post_info as $post_id => $post_data)
{
! $topic_id_list[$post_data['topic_id']] = 1;
!
! if ($post_data['forum_id'])
{
! $forum_id_list[$post_data['forum_id']] = 1;
}
! // Topic or Post. ;)
! /**
! * @todo this probably is a different method than the one used by delete_posts, does this cause counter inconsistency?
! */
! if ($post_data['topic_first_post_id'] == $post_id && $post_data['topic_last_post_id'] == $post_id)
{
! if ($post_data['forum_id'])
{
! if (!isset($forum_topics_real[$post_data['forum_id']]))
! {
! $forum_topics_real[$post_data['forum_id']] = 0;
! }
! $forum_topics_real[$post_data['forum_id']]++;
! $num_disapproved++;
}
-
- $disapprove_log[] = array(
- 'type' => 'topic',
- 'post_subject' => $post_data['post_subject'],
- 'forum_id' => $post_data['forum_id'],
- 'topic_id' => 0, // useless to log a topic id, as it will be deleted
- );
}
else
{
! if (!isset($topic_replies_real_sql[$post_data['topic_id']]))
! {
! $topic_replies_real_sql[$post_data['topic_id']] = 0;
! }
! $topic_replies_real_sql[$post_data['topic_id']]++;
!
! $disapprove_log[] = array(
'type' => 'post',
! 'post_subject' => $post_data['post_subject'],
! 'forum_id' => $post_data['forum_id'],
! 'topic_id' => $post_data['topic_id'],
! );
! }
! $post_disapprove_sql[] = $post_id;
}
! unset($post_data);
! if (sizeof($forum_topics_real))
! {
! foreach ($forum_topics_real as $forum_id => $topics_real)
! {
! $sql = 'UPDATE ' . FORUMS_TABLE . "
! SET forum_topics_real = forum_topics_real - $topics_real
! WHERE forum_id = $forum_id";
! $db->sql_query($sql);
! }
! }
! if (sizeof($topic_replies_real_sql))
! {
! foreach ($topic_replies_real_sql as $topic_id => $num_replies)
! {
! $sql = 'UPDATE ' . TOPICS_TABLE . "
! SET topic_replies_real = topic_replies_real - $num_replies
! WHERE topic_id = $topic_id";
! $db->sql_query($sql);
! }
! }
! if (sizeof($post_disapprove_sql))
{
if (!function_exists('delete_posts'))
{
--- 859,921 ----
if (confirm_box(true))
{
+ $disapprove_log = $disapprove_log_topics = $disapprove_log_posts = array();
+ $topic_replies_real = $post_disapprove_list = array();
! // Build a list of posts to be unapproved and get the related topics real replies count
foreach ($post_info as $post_id => $post_data)
{
! $post_disapprove_list[$post_id] = $post_data['topic_id'];
! if (!isset($topic_replies_real[$post_data['topic_id']]))
{
! $topic_replies_real[$post_data['topic_id']] = $post_data['topic_replies_real'];
}
+ }
! // Now we build the log array
! foreach ($post_disapprove_list as $post_id => $topic_id)
! {
! // If the count of disapproved posts for the topic is greater
! // than topic's real replies count, the whole topic is disapproved/deleted
! if (sizeof(array_keys($post_disapprove_list, $topic_id)) > $topic_replies_real[$topic_id])
{
! // Don't write the log more than once for every topic
! if (!isset($disapprove_log_topics[$topic_id]))
{
! // Build disapproved topics log
! $disapprove_log_topics[$topic_id] = array(
! 'type' => 'topic',
! 'post_subject' => $post_info[$post_id]['topic_title'],
! 'forum_id' => $post_info[$post_id]['forum_id'],
! 'topic_id' => 0, // useless to log a topic id, as it will be deleted
! );
}
}
else
{
! // Build disapproved posts log
! $disapprove_log_posts[] = array(
'type' => 'post',
! 'post_subject' => $post_info[$post_id]['post_subject'],
! 'forum_id' => $post_info[$post_id]['forum_id'],
! 'topic_id' => $post_info[$post_id]['topic_id'],
! );
! }
}
! // Get disapproved posts/topics counts separately
! $num_disapproved_topics = sizeof($disapprove_log_topics);
! $num_disapproved_posts = sizeof($disapprove_log_posts);
! // Build the whole log
! $disapprove_log = array_merge($disapprove_log_topics, $disapprove_log_posts);
! // Unset unneeded arrays
! unset($post_data, $disapprove_log_topics, $disapprove_log_posts);
! // Let's do the job - delete disapproved posts
! if (sizeof($post_disapprove_list))
{
if (!function_exists('delete_posts'))
{
***************
*** 949,970 ****
}
// We do not check for permissions here, because the moderator allowed approval/disapproval should be allowed to delete the disapproved posts
! delete_posts('post_id', $post_disapprove_sql);
foreach ($disapprove_log as $log_data)
{
add_log('mod', $log_data['forum_id'], $log_data['topic_id'], ($log_data['type'] == 'topic') ? 'LOG_TOPIC_DISAPPROVED' : 'LOG_POST_DISAPPROVED', $log_data['post_subject'], $disapprove_reason);
}
}
- unset($post_disapprove_sql, $topic_replies_real_sql);
-
- update_post_information('topic', array_keys($topic_id_list));
-
- if (sizeof($forum_id_list))
- {
- update_post_information('forum', array_keys($forum_id_list));
- }
- unset($topic_id_list, $forum_id_list);
$messenger = new messenger();
--- 923,937 ----
}
// We do not check for permissions here, because the moderator allowed approval/disapproval should be allowed to delete the disapproved posts
! // Note: function delete_posts triggers related forums/topics sync,
! // so we don't need to call update_post_information later and to adjust real topic replies or forum topics count manually
! delete_posts('post_id', array_keys($post_disapprove_list));
foreach ($disapprove_log as $log_data)
{
add_log('mod', $log_data['forum_id'], $log_data['topic_id'], ($log_data['type'] == 'topic') ? 'LOG_TOPIC_DISAPPROVED' : 'LOG_POST_DISAPPROVED', $log_data['post_subject'], $disapprove_reason);
}
}
$messenger = new messenger();
***************
*** 1032,1044 ****
$messenger->save_queue();
! if (sizeof($forum_topics_real))
{
! $success_msg = ($num_disapproved == 1) ? 'TOPIC_DISAPPROVED_SUCCESS' : 'TOPICS_DISAPPROVED_SUCCESS';
}
else
{
! $success_msg = (sizeof($post_id_list) == 1) ? 'POST_DISAPPROVED_SUCCESS' : 'POSTS_DISAPPROVED_SUCCESS';
}
}
else
--- 999,1011 ----
$messenger->save_queue();
! if ($num_disapproved_topics)
{
! $success_msg = ($num_disapproved_topics == 1) ? 'TOPIC_DISAPPROVED_SUCCESS' : 'TOPICS_DISAPPROVED_SUCCESS';
}
else
{
! $success_msg = ($num_disapproved_posts == 1) ? 'POST_DISAPPROVED_SUCCESS' : 'POSTS_DISAPPROVED_SUCCESS';
}
}
else
|
|
From: Henry S. <kel...@ph...> - 2009-08-10 11:52:58
|
Author: Kellanved
Date: Mon Aug 10 12:52:10 2009
New Revision: 9945
Log:
#49345
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html
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 Mon Aug 10 12:52:10 2009
***************
*** 10,16 ****
<dt><label>{QA_CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
<dd>
<input type="text" tabindex="10" name="qa_answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" />
! <input type="hidden" name="confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" />
</dd>
</dl>
--- 10,16 ----
<dt><label>{QA_CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
<dd>
<input type="text" tabindex="10" name="qa_answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" />
! <input type="hidden" name="qa_confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" />
</dd>
</dl>
|
|
From: Meik S. <acy...@ph...> - 2009-08-10 11:18:07
|
Author: acydburn
Date: Mon Aug 10 12:17:24 2009
New Revision: 9944
Log:
check for not set values in acp_board to correctly grab those input elements not populated if empty (checkboxes and multiple select fields)
Modified:
branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php Mon Aug 10 12:17:24 2009
***************
*** 440,446 ****
// We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to...
foreach ($display_vars['vars'] as $config_name => $null)
{
! if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false)
{
continue;
}
--- 440,446 ----
// We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to...
foreach ($display_vars['vars'] as $config_name => $null)
{
! if (strpos($config_name, 'legend') !== false)
{
continue;
}
***************
*** 450,455 ****
--- 450,461 ----
continue;
}
+ // It could happen that the cfg array is not set. This happens within feed settings if unselecting all forums in the multiple select fields for example (it is the same as checkbox handling)
+ if (!isset($cfg_array[$config_name]))
+ {
+ $cfg_array[$config_name] = '';
+ }
+
// Erm, we spotted an array
if ($null['type'] == 'select_multiple' && $submit && isset($_REQUEST['config'][$config_name]))
{
|
|
From: Meik S. <acy...@ph...> - 2009-08-10 11:15:08
|
Author: acydburn
Date: Mon Aug 10 12:14:21 2009
New Revision: 9943
Log:
ok, r9704 was correct - i used a wrong code base within my tests. :/
Modified:
branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php Mon Aug 10 12:14:21 2009
***************
*** 440,446 ****
// We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to...
foreach ($display_vars['vars'] as $config_name => $null)
{
! if ($null === false || strpos($config_name, 'legend') !== false)
{
continue;
}
--- 440,446 ----
// We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to...
foreach ($display_vars['vars'] as $config_name => $null)
{
! if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false)
{
continue;
}
***************
*** 450,461 ****
continue;
}
- // If not set, then this is a valid entry and needs to be emptied (select_multiple, checkbox)
- if (!isset($cfg_array[$config_name]))
- {
- $cfg_array[$config_name] = '';
- }
-
// Erm, we spotted an array
if ($null['type'] == 'select_multiple' && $submit && isset($_REQUEST['config'][$config_name]))
{
--- 450,455 ----
|
|
From: Henry S. <kel...@ph...> - 2009-08-10 09:47:21
|
Author: Kellanved
Date: Mon Aug 10 10:46:38 2009
New Revision: 9942
Log:
class name
Modified:
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php Mon Aug 10 10:46:38 2009
***************
*** 19,25 ****
/**
* Placeholder for autoload
*/
! if (!class_exists('captcha_abstract'))
{
include($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
}
--- 19,25 ----
/**
* Placeholder for autoload
*/
! if (!class_exists('phpbb_default_captcha'))
{
include($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
}
|
|
From: Meik S. <acy...@ph...> - 2009-08-10 09:14:13
|
Author: acydburn
Date: Mon Aug 10 10:13:28 2009
New Revision: 9941
Log:
reverted all changes made to this code block, especially the one mentioned in r9704 with reference to wrong bug report "undoing change from #9575, as it broke the board disabled message". The board disabled message still works fine. If there are any problems with the code and settings within the ACP, please tell me and i will check them.
Modified:
branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php Mon Aug 10 10:13:28 2009
***************
*** 440,446 ****
// We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to...
foreach ($display_vars['vars'] as $config_name => $null)
{
! if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false)
{
continue;
}
--- 440,446 ----
// We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to...
foreach ($display_vars['vars'] as $config_name => $null)
{
! if ($null === false || strpos($config_name, 'legend') !== false)
{
continue;
}
***************
*** 450,455 ****
--- 450,461 ----
continue;
}
+ // If not set, then this is a valid entry and needs to be emptied (select_multiple, checkbox)
+ if (!isset($cfg_array[$config_name]))
+ {
+ $cfg_array[$config_name] = '';
+ }
+
// Erm, we spotted an array
if ($null['type'] == 'select_multiple' && $submit && isset($_REQUEST['config'][$config_name]))
{
|
|
From: Henry S. <kel...@ph...> - 2009-08-07 15:38:18
|
Author: Kellanved
Date: Fri Aug 7 16:37:27 2009
New Revision: 9940
Log:
include vs include_once
Modified:
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php Fri Aug 7 16:37:27 2009
***************
*** 21,27 ****
*/
if (!class_exists('captcha_abstract'))
{
! include_once($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
}
/**
--- 21,27 ----
*/
if (!class_exists('captcha_abstract'))
{
! include($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
}
/**
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php Fri Aug 7 16:37:27 2009
***************
*** 21,27 ****
*/
if (!class_exists('phpbb_default_captcha'))
{
! include_once($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
}
/**
--- 21,27 ----
*/
if (!class_exists('phpbb_default_captcha'))
{
! include($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
}
/**
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php Fri Aug 7 16:37:27 2009
***************
*** 19,25 ****
if (!class_exists('phpbb_default_captcha'))
{
// we need the classic captcha code for tracking solutions and attempts
! include_once($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
}
/**
--- 19,25 ----
if (!class_exists('phpbb_default_captcha'))
{
// we need the classic captcha code for tracking solutions and attempts
! include($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
}
/**
|
|
From: Andreas F. <ba...@ph...> - 2009-08-07 14:32:08
|
Author: bantu
Date: Fri Aug 7 15:31:24 2009
New Revision: 9939
Log:
Coding guidelines: Tiny whitespace change for an unreleased file.
Modified:
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php Fri Aug 7 15:31:24 2009
***************
*** 100,107 ****
$template->assign_vars(array(
'CONFIRM_IMAGE_LINK' => $link,
! 'CONFIRM_IMAGE' => '<img src="'. $link . '" />',
! 'CONFIRM_IMG' => '<img src="'. $link . '" />',
'CONFIRM_ID' => $this->confirm_id,
'S_CONFIRM_CODE' => true,
'S_TYPE' => $this->type,
--- 100,107 ----
$template->assign_vars(array(
'CONFIRM_IMAGE_LINK' => $link,
! 'CONFIRM_IMAGE' => '<img src="' . $link . '" />',
! 'CONFIRM_IMG' => '<img src="' . $link . '" />',
'CONFIRM_ID' => $this->confirm_id,
'S_CONFIRM_CODE' => true,
'S_TYPE' => $this->type,
|
|
From: Andreas F. <ba...@ph...> - 2009-08-07 13:54:34
|
Author: bantu
Date: Fri Aug 7 14:53:17 2009
New Revision: 9938
Log:
Remove some left over code introduced in r9575, reverted in r9704.
Modified:
branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php Fri Aug 7 14:53:17 2009
***************
*** 450,462 ****
continue;
}
- // If not set, then this is a valid entry and needs to be emptied (select_multiple, checkbox)
- if (!isset($cfg_array[$config_name]))
- {
- $cfg_array[$config_name] = '';
- }
-
-
// Erm, we spotted an array
if ($null['type'] == 'select_multiple' && $submit && isset($_REQUEST['config'][$config_name]))
{
--- 450,455 ----
|
|
From: Henry S. <kel...@ph...> - 2009-08-07 13:02:55
|
Author: Kellanved
Date: Fri Aug 7 14:02:14 2009
New Revision: 9937
Log:
add transactions to sync(); not one big one to avoid nesting.
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_admin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_admin.php Fri Aug 7 14:02:14 2009
***************
*** 1330,1335 ****
--- 1330,1336 ----
switch ($mode)
{
case 'topic_moved':
+ $db->sql_transaction('begin');
switch ($db->sql_layer)
{
case 'mysql4':
***************
*** 1363,1374 ****
$sql = 'DELETE FROM ' . TOPICS_TABLE . '
WHERE ' . $db->sql_in_set('topic_id', $topic_id_ary);
$db->sql_query($sql);
!
break;
}
! break;
case 'topic_approved':
switch ($db->sql_layer)
{
case 'mysql4':
--- 1364,1379 ----
$sql = 'DELETE FROM ' . TOPICS_TABLE . '
WHERE ' . $db->sql_in_set('topic_id', $topic_id_ary);
$db->sql_query($sql);
!
break;
}
!
! $db->sql_transaction('commit');
! break;
case 'topic_approved':
+
+ $db->sql_transaction('begin');
switch ($db->sql_layer)
{
case 'mysql4':
***************
*** 1404,1414 ****
$db->sql_query($sql);
break;
}
! break;
case 'post_reported':
$post_ids = $post_reported = array();
!
$sql = 'SELECT p.post_id, p.post_reported
FROM ' . POSTS_TABLE . " p
$where_sql
--- 1409,1423 ----
$db->sql_query($sql);
break;
}
!
! $db->sql_transaction('commit');
! break;
case 'post_reported':
$post_ids = $post_reported = array();
!
! $db->sql_transaction('begin');
!
$sql = 'SELECT p.post_id, p.post_reported
FROM ' . POSTS_TABLE . " p
$where_sql
***************
*** 1459,1465 ****
WHERE ' . $db->sql_in_set('post_id', $post_ids);
$db->sql_query($sql);
}
! break;
case 'topic_reported':
if ($sync_extra)
--- 1468,1476 ----
WHERE ' . $db->sql_in_set('post_id', $post_ids);
$db->sql_query($sql);
}
!
! $db->sql_transaction('commit');
! break;
case 'topic_reported':
if ($sync_extra)
***************
*** 1469,1474 ****
--- 1480,1487 ----
$topic_ids = $topic_reported = array();
+ $db->sql_transaction('begin');
+
$sql = 'SELECT DISTINCT(t.topic_id)
FROM ' . POSTS_TABLE . " t
$where_sql_and t.post_reported = 1";
***************
*** 1501,1511 ****
WHERE ' . $db->sql_in_set('topic_id', $topic_ids);
$db->sql_query($sql);
}
! break;
case 'post_attachment':
$post_ids = $post_attachment = array();
$sql = 'SELECT p.post_id, p.post_attachment
FROM ' . POSTS_TABLE . " p
$where_sql
--- 1514,1528 ----
WHERE ' . $db->sql_in_set('topic_id', $topic_ids);
$db->sql_query($sql);
}
!
! $db->sql_transaction('commit');
! break;
case 'post_attachment':
$post_ids = $post_attachment = array();
+ $db->sql_transaction('begin');
+
$sql = 'SELECT p.post_id, p.post_attachment
FROM ' . POSTS_TABLE . " p
$where_sql
***************
*** 1556,1562 ****
WHERE ' . $db->sql_in_set('post_id', $post_ids);
$db->sql_query($sql);
}
! break;
case 'topic_attachment':
if ($sync_extra)
--- 1573,1581 ----
WHERE ' . $db->sql_in_set('post_id', $post_ids);
$db->sql_query($sql);
}
!
! $db->sql_transaction('commit');
! break;
case 'topic_attachment':
if ($sync_extra)
***************
*** 1566,1571 ****
--- 1585,1592 ----
$topic_ids = $topic_attachment = array();
+ $db->sql_transaction('begin');
+
$sql = 'SELECT DISTINCT(t.topic_id)
FROM ' . POSTS_TABLE . " t
$where_sql_and t.post_attachment = 1";
***************
*** 1598,1607 ****
WHERE ' . $db->sql_in_set('topic_id', $topic_ids);
$db->sql_query($sql);
}
! break;
case 'forum':
// 1: Get the list of all forums
$sql = 'SELECT f.*
FROM ' . FORUMS_TABLE . " f
--- 1619,1633 ----
WHERE ' . $db->sql_in_set('topic_id', $topic_ids);
$db->sql_query($sql);
}
!
! $db->sql_transaction('commit');
!
! break;
case 'forum':
+ $db->sql_transaction('begin');
+
// 1: Get the list of all forums
$sql = 'SELECT f.*
FROM ' . FORUMS_TABLE . " f
***************
*** 1802,1812 ****
$db->sql_query($sql);
}
}
! break;
case 'topic':
$topic_data = $post_ids = $approved_unapproved_ids = $resync_forums = $delete_topics = $delete_posts = $moved_topics = array();
$sql = 'SELECT t.topic_id, t.forum_id, t.topic_moved_id, t.topic_approved, ' . (($sync_extra) ? 't.topic_attachment, t.topic_reported, ' : '') . 't.topic_poster, t.topic_time, t.topic_replies, t.topic_replies_real, t.topic_first_post_id, t.topic_first_poster_name, t.topic_first_poster_colour, t.topic_last_post_id, t.topic_last_post_subject, t.topic_last_poster_id, t.topic_last_poster_name, t.topic_last_poster_colour, t.topic_last_post_time
FROM ' . TOPICS_TABLE . " t
$where_sql";
--- 1828,1842 ----
$db->sql_query($sql);
}
}
!
! $db->sql_transaction('commit');
! break;
case 'topic':
$topic_data = $post_ids = $approved_unapproved_ids = $resync_forums = $delete_topics = $delete_posts = $moved_topics = array();
+ $db->sql_transaction('begin');
+
$sql = 'SELECT t.topic_id, t.forum_id, t.topic_moved_id, t.topic_approved, ' . (($sync_extra) ? 't.topic_attachment, t.topic_reported, ' : '') . 't.topic_poster, t.topic_time, t.topic_replies, t.topic_replies_real, t.topic_first_post_id, t.topic_first_poster_name, t.topic_first_poster_colour, t.topic_last_post_id, t.topic_last_post_subject, t.topic_last_poster_id, t.topic_last_poster_name, t.topic_last_poster_colour, t.topic_last_post_time
FROM ' . TOPICS_TABLE . " t
$where_sql";
***************
*** 2129,2134 ****
--- 2159,2166 ----
}
unset($topic_data);
+ $db->sql_transaction('commit');
+
// if some topics have been resync'ed then resync parent forums
// except when we're only syncing a range, we don't want to sync forums during
// batch processing.
***************
*** 2136,2142 ****
{
sync('forum', 'forum_id', array_values($resync_forums), true, true);
}
! break;
}
return;
--- 2168,2174 ----
{
sync('forum', 'forum_id', array_values($resync_forums), true, true);
}
! break;
}
return;
|
|
From: Andreas F. <ba...@ph...> - 2009-08-07 12:51:14
|
Author: bantu
Date: Fri Aug 7 13:50:25 2009
New Revision: 9936
Log:
Bug #49215 again.
Modified:
branches/phpBB-3_0_0/phpBB/install/install_convert.php
branches/phpBB-3_0_0/phpBB/install/install_update.php
Modified: branches/phpBB-3_0_0/phpBB/install/install_convert.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/install_convert.php (original)
--- branches/phpBB-3_0_0/phpBB/install/install_convert.php Fri Aug 7 13:50:25 2009
***************
*** 1558,1564 ****
*/
function finish_conversion()
{
! global $db, $phpbb_root_path, $convert, $config, $language, $user, $template;
$db->sql_query('DELETE FROM ' . CONFIG_TABLE . "
WHERE config_name = 'convert_progress'
--- 1558,1564 ----
*/
function finish_conversion()
{
! global $db, $phpbb_root_path, $phpEx, $convert, $config, $language, $user, $template;
$db->sql_query('DELETE FROM ' . CONFIG_TABLE . "
WHERE config_name = 'convert_progress'
***************
*** 1567,1573 ****
OR config_name = 'convert_db_user'");
$db->sql_query('DELETE FROM ' . SESSIONS_TABLE);
! @unlink($phpbb_root_path . 'cache/data_global.php');
cache_moderators();
// And finally, add a note to the log
--- 1567,1573 ----
OR config_name = 'convert_db_user'");
$db->sql_query('DELETE FROM ' . SESSIONS_TABLE);
! @unlink($phpbb_root_path . 'cache/data_global.' . $phpEx);
cache_moderators();
// And finally, add a note to the log
Modified: branches/phpBB-3_0_0/phpBB/install/install_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/install_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/install_update.php Fri Aug 7 13:50:25 2009
***************
*** 206,212 ****
if (in_array('language/en/install.php', $this->update_info['files']))
{
$lang = array();
! include($this->new_location . 'language/en/install.php');
// only add new keys to user's language in english
$new_keys = array_diff(array_keys($lang), array_keys($user->lang));
foreach ($new_keys as $i => $new_key)
--- 206,212 ----
if (in_array('language/en/install.php', $this->update_info['files']))
{
$lang = array();
! include($this->new_location . 'language/en/install.' . $phpEx);
// only add new keys to user's language in english
$new_keys = array_diff(array_keys($lang), array_keys($user->lang));
foreach ($new_keys as $i => $new_key)
|
|
From: Andreas F. <ba...@ph...> - 2009-08-07 12:11:21
|
Author: bantu
Date: Fri Aug 7 13:10:34 2009
New Revision: 9935
Log:
Fix bug #49215 - Use $phpEx variable instead of hardcoded '.php'
Modified:
branches/phpBB-3_0_0/phpBB/install/install_update.php
Modified: branches/phpBB-3_0_0/phpBB/install/install_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/install_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/install_update.php Fri Aug 7 13:10:34 2009
***************
*** 1556,1562 ****
if ($info === false)
{
$update_info = array();
! include($phpbb_root_path . 'install/update/index.php');
$info = (empty($update_info) || !is_array($update_info)) ? false : $update_info;
if ($info !== false)
--- 1556,1562 ----
if ($info === false)
{
$update_info = array();
! include($phpbb_root_path . 'install/update/index.' . $phpEx);
$info = (empty($update_info) || !is_array($update_info)) ? false : $update_info;
if ($info !== false)
***************
*** 1570,1576 ****
global $phpbb_root_path, $phpEx;
$update_info = array();
! include($phpbb_root_path . 'install/update/index.php');
$info = (empty($update_info) || !is_array($update_info)) ? false : $update_info;
$errstr = ($info === false) ? $user->lang['WRONG_INFO_FILE_FORMAT'] : '';
--- 1570,1576 ----
global $phpbb_root_path, $phpEx;
$update_info = array();
! include($phpbb_root_path . 'install/update/index.' . $phpEx);
$info = (empty($update_info) || !is_array($update_info)) ? false : $update_info;
$errstr = ($info === false) ? $user->lang['WRONG_INFO_FILE_FORMAT'] : '';
|
|
From: Meik S. <acy...@ph...> - 2009-08-06 13:50:30
|
Author: acydburn
Date: Thu Aug 6 14:32:14 2009
New Revision: 9934
Log:
pm class is not supposed to be in there, also results in white background
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_profile_signature.html
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_profile_signature.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_profile_signature.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_profile_signature.html Thu Aug 6 14:32:14 2009
***************
*** 8,14 ****
<div class="panel">
<div class="inner"><span class="corners-top"><span></span></span>
<h3>{L_SIGNATURE_PREVIEW}</h3>
! <div class="postbody pm">
<div class="signature" style="border-top:none; margin-top: 0; ">{SIGNATURE_PREVIEW}</div>
</div>
<span class="corners-bottom"><span></span></span></div>
--- 8,14 ----
<div class="panel">
<div class="inner"><span class="corners-top"><span></span></span>
<h3>{L_SIGNATURE_PREVIEW}</h3>
! <div class="postbody">
<div class="signature" style="border-top:none; margin-top: 0; ">{SIGNATURE_PREVIEW}</div>
</div>
<span class="corners-bottom"><span></span></span></div>
***************
*** 33,39 ****
<!-- IF S_LINKS_ALLOWED -->
<div><label for="disable_magic_url"><input type="checkbox" name="disable_magic_url" id="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label></div>
<!-- ENDIF -->
!
</fieldset>
<span class="corners-bottom"><span></span></span></div>
--- 33,39 ----
<!-- IF S_LINKS_ALLOWED -->
<div><label for="disable_magic_url"><input type="checkbox" name="disable_magic_url" id="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label></div>
<!-- ENDIF -->
!
</fieldset>
<span class="corners-bottom"><span></span></span></div>
***************
*** 41,48 ****
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}
! <input type="reset" name="reset" value="{L_RESET}" class="button2" />
! <input type="submit" name="preview" value="{L_PREVIEW}" class="button2" />
<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
{S_FORM_TOKEN}
</fieldset>
--- 41,48 ----
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}
! <input type="reset" name="reset" value="{L_RESET}" class="button2" />
! <input type="submit" name="preview" value="{L_PREVIEW}" class="button2" />
<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
{S_FORM_TOKEN}
</fieldset>
|
|
From: Yuriy R. <mar...@ph...> - 2009-08-06 09:13:05
|
Author: marshalrusty
Date: Thu Aug 6 10:12:21 2009
New Revision: 9933
Log:
More language changes
Modified:
branches/phpBB-3_0_0/phpBB/language/en/acp/prune.php
branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php
branches/phpBB-3_0_0/phpBB/language/en/captcha_recaptcha.php
branches/phpBB-3_0_0/phpBB/language/en/email/admin_welcome_inactive.txt
branches/phpBB-3_0_0/phpBB/language/en/email/coppa_resend_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/pm_report_closed.txt
branches/phpBB-3_0_0/phpBB/language/en/email/pm_report_deleted.txt
branches/phpBB-3_0_0/phpBB/language/en/email/user_reactivate_account.txt
branches/phpBB-3_0_0/phpBB/language/en/email/user_remind_inactive.txt
branches/phpBB-3_0_0/phpBB/language/en/email/user_resend_inactive.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
branches/phpBB-3_0_0/phpBB/language/en/install.php
branches/phpBB-3_0_0/phpBB/language/en/memberlist.php
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/prune.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/prune.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/prune.php Thu Aug 6 10:12:21 2009
***************
*** 37,46 ****
// User pruning
$lang = array_merge($lang, array(
! 'ACP_PRUNE_USERS_EXPLAIN' => 'Here you can delete (or deactivate) users from your board. This can be done in a variety of ways; by post count, last activity, etc. Each of these criteria can be combined, i.e. you can prune users last active before 2002-01-01 with fewer than 10 posts. Alternatively you can enter a list of users directly into the text box, each on a separate line - any criteria entered will be ignored. Take care with this facility! Once a user is deleted there is no way back.',
'DEACTIVATE_DELETE' => 'Deactivate or delete',
! 'DEACTIVATE_DELETE_EXPLAIN' => 'Choose whether to deactivate users or delete them entirely, note there is no undo!',
'DELETE_USERS' => 'Delete',
'DELETE_USER_POSTS' => 'Delete pruned user posts',
'DELETE_USER_POSTS_EXPLAIN' => 'Removes posts made by deleted users, has no effect if users are deactivated.',
--- 37,46 ----
// User pruning
$lang = array_merge($lang, array(
! 'ACP_PRUNE_USERS_EXPLAIN' => 'This section allows you to delete or deactivate users on your board. Accounts can be filtered in a variety of ways; by post count, most recent activity, etc. Criteria may be combined to narrow down which accounts are affected. For example, you can prune users with fewer than 10 posts, who were also inactive after 2002-01-01. Alternatively, you may skip the criteria selection completely by entering a list of users (each on a separate line) into the text field. Take care with this facility! Once a user is deleted, there is no way to reverse the action.',
'DEACTIVATE_DELETE' => 'Deactivate or delete',
! 'DEACTIVATE_DELETE_EXPLAIN' => 'Choose whether to deactivate users or delete them entirely. Please note that deleted users cannot be restored!',
'DELETE_USERS' => 'Delete',
'DELETE_USER_POSTS' => 'Delete pruned user posts',
'DELETE_USER_POSTS_EXPLAIN' => 'Removes posts made by deleted users, has no effect if users are deactivated.',
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 Thu Aug 6 10:12:21 2009
***************
*** 37,63 ****
$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',
! 'ANSWERS_EXPLAIN' => 'The Answers. Please write one answer per line.',
'CONFIRM_QUESTION' => 'Question',
'ANSWER' => 'Answer',
'EDIT_QUESTION' => 'Edit Question',
'QUESTIONS' => 'Questions',
! 'QUESTIONS_EXPLAIN' => 'Here you can add and edit questions to be asked on registration. You have to provide at least one question in the default board language to use this plugin. Questions should be easy for your target audience, but beyond the ability of Googleâ¢. Also, remember to change the questions regularly. If your question relies on punctuation, spelling or capitalisation, use the strict setting.',
'QUESTION_DELETED' => 'Question deleted',
'QUESTION_LANG' => 'Language',
! 'QUESTION_LANG_EXPLAIN' => 'The language this question and its answers is written in.',
'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
--- 37,63 ----
$lang = array_merge($lang, array(
'CAPTCHA_QA' => 'Q&A CAPTCHA',
! 'CONFIRM_QUESTION_EXPLAIN' => 'The following question is a means of identifying and preventing automated submissions.',
! 'CONFIRM_QUESTION_WRONG' => 'You have provided an invalid answer to the confirmation question.',
'QUESTION_ANSWERS' => 'Answers',
! 'ANSWERS_EXPLAIN' => 'Please enter valid answers to the question, one per line.',
'CONFIRM_QUESTION' => 'Question',
'ANSWER' => 'Answer',
'EDIT_QUESTION' => 'Edit Question',
'QUESTIONS' => 'Questions',
! 'QUESTIONS_EXPLAIN' => 'During registration, users will be asked one of the questions specified here. To use this plugin, at least one question must be set in the default language. These questions should be easy for your target audience to answer, but beyond the ability of a bot capable of running a Google⢠search. Using a large and regulary changed set of questions will yield the best results. Enable the strict setting if your question relies on punctuation or capitalisation.',
'QUESTION_DELETED' => 'Question deleted',
'QUESTION_LANG' => 'Language',
! 'QUESTION_LANG_EXPLAIN' => 'The language that this question and its answers are written in.',
'QUESTION_STRICT' => 'Strict check',
! 'QUESTION_STRICT_EXPLAIN' => 'If enabled, capitalisation and whitespace will also be enforced.',
'QUESTION_TEXT' => 'Question',
'QUESTION_TEXT_EXPLAIN' => 'The question that will be asked on registration.',
! 'QA_ERROR_MSG' => 'Please fill in all fields and enter at least one answer.',
));
?>
\ No newline at end of file
Modified: branches/phpBB-3_0_0/phpBB/language/en/captcha_recaptcha.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/captcha_recaptcha.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/captcha_recaptcha.php Thu Aug 6 10:12:21 2009
***************
*** 46,52 ****
'RECAPTCHA_PRIVATE' => 'Private reCaptcha key',
'RECAPTCHA_PRIVATE_EXPLAIN' => 'Your private reCaptcha key. Keys can be obtained on <a href="http://recaptcha.net">reCaptcha.net</a>.',
! 'RECAPTCHA_EXPLAIN' => 'Please enter both of the words displayed below into the text field underneath. This is a measure taken to prevent spam.',
));
?>
\ No newline at end of file
--- 46,52 ----
'RECAPTCHA_PRIVATE' => 'Private reCaptcha key',
'RECAPTCHA_PRIVATE_EXPLAIN' => 'Your private reCaptcha key. Keys can be obtained on <a href="http://recaptcha.net">reCaptcha.net</a>.',
! 'RECAPTCHA_EXPLAIN' => 'In an effort to prevent automatic submissions, we require that you enter both of the words displayed below into the text field underneath.',
));
?>
\ No newline at end of file
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 Thu Aug 6 10:12:21 2009
***************
*** 10,18 ****
Board URL: {U_BOARD}
----------------------------
! Your account is currently inactive, the administrator of the board will need to activate it before you can log in. You will receive another e-mail when this has occurred.
! Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
Thank you for registering.
--- 10,18 ----
Board URL: {U_BOARD}
----------------------------
! Your account is currently inactive and will need to be approved by an administrator before you can log in. Another email will be sent when this had occured.
! Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
Thank you for registering.
Modified: branches/phpBB-3_0_0/phpBB/language/en/email/coppa_resend_inactive.txt
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/email/coppa_resend_inactive.txt (original)
--- branches/phpBB-3_0_0/phpBB/language/en/email/coppa_resend_inactive.txt Thu Aug 6 10:12:21 2009
***************
*** 2,10 ****
{WELCOME_MSG}
! In compliance with the COPPA your account is currently inactive.
! Please print this message out and have your parent or guardian sign and date it. Then fax it to:
{FAX_INFO}
--- 2,10 ----
{WELCOME_MSG}
! In compliance with the COPPA, your account is currently inactive.
! Please print this message and have your parent or guardian sign and date it. Then fax it to:
{FAX_INFO}
***************
*** 33,41 ****
------------------------------ CUT HERE ------------------------------
! Once the administrator has received the above form via fax or regular mail your account will be activated.
! Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
Thank you for registering.
--- 33,41 ----
------------------------------ CUT HERE ------------------------------
! Once the administrator has received the above form via fax or regular mail, your account will be activated.
! Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
Thank you for registering.
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 Thu Aug 6 10:12:21 2009
***************
*** 2,10 ****
{WELCOME_MSG}
! In compliance with the COPPA your account is currently inactive.
! Please print this message out and have your parent or guardian sign and date it. Then fax it to:
{FAX_INFO}
--- 2,10 ----
{WELCOME_MSG}
! In compliance with the COPPA, your account is currently inactive.
! Please print this message and have your parent or guardian sign and date it. Then fax it to:
{FAX_INFO}
***************
*** 33,41 ****
------------------------------ CUT HERE ------------------------------
! Once the administrator has received the above form via fax or regular mail your account will be activated.
! Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
Thank you for registering.
--- 33,41 ----
------------------------------ CUT HERE ------------------------------
! Once the administrator has received the above form via fax or regular mail, your account will be activated.
! Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
Thank you for registering.
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 Thu Aug 6 10:12:21 2009
***************
*** 4,10 ****
You have successfully installed phpBB on your server.
! This e-mail contains important information on your installation that you should keep safe. The password has been encrypted in the database and cannot be recovered, although you can request a new password should you lose this one.
----------------------------
Username: {USERNAME}
--- 4,10 ----
You have successfully installed phpBB on your server.
! This e-mail contains important information regarding your installation and should be kept for reference. Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
----------------------------
Username: {USERNAME}
***************
*** 12,19 ****
Board URL: {U_BOARD}
----------------------------
! Useful information on your phpBB installation can be found in the docs folder of your installation and on phpBB.com's support page - http://www.phpbb.com/support/
! In order to keep the board safe and secure, it is highly recommended that you keep current with software releases which can be easily done by subscribing to phpBB.com's mailing list, located at the above URL.
{EMAIL_SIG}
\ No newline at end of file
--- 12,19 ----
Board URL: {U_BOARD}
----------------------------
! Useful information regarding the phpBB software can be found in the docs folder of your installation and on phpBB.com's support page - http://www.phpbb.com/support/
! In order to keep your board safe and secure, we highly recommended keeping current with software releases. For your convenience, a mailing list is available at the page referenced above.
{EMAIL_SIG}
\ No newline at end of file
Modified: branches/phpBB-3_0_0/phpBB/language/en/email/pm_report_closed.txt
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/email/pm_report_closed.txt (original)
--- branches/phpBB-3_0_0/phpBB/language/en/email/pm_report_closed.txt Thu Aug 6 10:12:21 2009
***************
*** 2,8 ****
Hello {USERNAME},
! You are receiving this notification because the report you filed on the private message "{PM_SUBJECT}" at "{SITENAME}" was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message.
{EMAIL_SIG}
\ No newline at end of file
--- 2,8 ----
Hello {USERNAME},
! You are receiving this notification because the report you filed regarding the private message "{PM_SUBJECT}" at "{SITENAME}" has been tended to by a moderator or administrator. The report is now closed. If you have further questions, please contact {CLOSER_NAME} by private message.
{EMAIL_SIG}
\ No newline at end of file
Modified: branches/phpBB-3_0_0/phpBB/language/en/email/pm_report_deleted.txt
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/email/pm_report_deleted.txt (original)
--- branches/phpBB-3_0_0/phpBB/language/en/email/pm_report_deleted.txt Thu Aug 6 10:12:21 2009
***************
*** 2,8 ****
Hello {USERNAME},
! You are receiving this notification because the report you filed on the post "{PM_SUBJECT}" at "{SITENAME}" was deleted by a moderator or by an administrator.
{EMAIL_SIG}
\ No newline at end of file
--- 2,8 ----
Hello {USERNAME},
! You are receiving this notification because the report you filed regarding the post "{PM_SUBJECT}" at "{SITENAME}" was deleted by a moderator or administrator.
{EMAIL_SIG}
\ No newline at end of file
Modified: branches/phpBB-3_0_0/phpBB/language/en/email/user_reactivate_account.txt
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/email/user_reactivate_account.txt (original)
--- branches/phpBB-3_0_0/phpBB/language/en/email/user_reactivate_account.txt Thu Aug 6 10:12:21 2009
***************
*** 9,15 ****
Username: {USERNAME}
----------------------------
! Your password has been encrypted in our database. Should you forget your password you can request a new one which will be activated in the same way as this account.
Please visit the following link to reactivate your account:
--- 9,15 ----
Username: {USERNAME}
----------------------------
! Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
Please visit the following link to reactivate your account:
Modified: branches/phpBB-3_0_0/phpBB/language/en/email/user_remind_inactive.txt
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/email/user_remind_inactive.txt (original)
--- branches/phpBB-3_0_0/phpBB/language/en/email/user_remind_inactive.txt Thu Aug 6 10:12:21 2009
***************
*** 2,8 ****
Hello {USERNAME},
! On {REGISTER_DATE} you registered a new account at "{SITENAME}". To date you have not activated this account which is a prerequisite for board login. For your convenience the activation link is repeated below.
{U_ACTIVATE}
--- 2,8 ----
Hello {USERNAME},
! This notification is a reminder that your account at "{SITENAME}", created on {REGISTER_DATE}, remains inactive. If you would like to activate this account, please visit the following link:
{U_ACTIVATE}
Modified: branches/phpBB-3_0_0/phpBB/language/en/email/user_resend_inactive.txt
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/email/user_resend_inactive.txt (original)
--- branches/phpBB-3_0_0/phpBB/language/en/email/user_resend_inactive.txt Thu Aug 6 10:12:21 2009
***************
*** 8,16 ****
Username: {USERNAME}
----------------------------
! Your password has been encrypted in our database. Should you forget your password you can request a new one which will be activated in the same way as this account.
! Your account is currently inactive. You cannot use it until you visit the following link:
{U_ACTIVATE}
--- 8,16 ----
Username: {USERNAME}
----------------------------
! Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
! Please visit the following link in order to activate your account:
{U_ACTIVATE}
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 Thu Aug 6 10:12:21 2009
***************
*** 10,16 ****
Board URL: {U_BOARD}
----------------------------
! Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
Thank you for registering.
--- 10,16 ----
Board URL: {U_BOARD}
----------------------------
! Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
Thank you for registering.
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 Thu Aug 6 10:12:21 2009
***************
*** 10,20 ****
Board URL: {U_BOARD}
----------------------------
! Your account is currently inactive. You cannot use it until you visit the following link:
{U_ACTIVATE}
! Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
Thank you for registering.
--- 10,20 ----
Board URL: {U_BOARD}
----------------------------
! Please visit the following link in order to activate your account:
{U_ACTIVATE}
! Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
Thank you for registering.
Modified: branches/phpBB-3_0_0/phpBB/language/en/install.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/install.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/install.php Thu Aug 6 10:12:21 2009
***************
*** 133,139 ****
'DB_PASSWORD' => 'Database password',
'DB_PORT' => 'Database server port',
'DB_PORT_EXPLAIN' => 'Leave this blank unless you know the server operates on a non-standard port.',
! 'DB_UPDATE_NOT_SUPPORTED' => 'Sorry, but you are not able to update your phpBB database with this script. This update script updates the phpBB database from at least version â%1$sâ, but your version is â%2$sâ. Please try to update to an older version of phpBB first or post within our support forums to get more help.',
'DB_USERNAME' => 'Database username',
'DB_TEST' => 'Test connection',
'DEFAULT_LANG' => 'Default board language',
--- 133,139 ----
'DB_PASSWORD' => 'Database password',
'DB_PORT' => 'Database server port',
'DB_PORT_EXPLAIN' => 'Leave this blank unless you know the server operates on a non-standard port.',
! 'DB_UPDATE_NOT_SUPPORTED' => 'We are sorry, but this script does not support updating from versions of phpBB prior to â%1$sâ. The version you currently have installed is â%2$sâ. Please update to a previous version before running this script. Assistance with this is available in the Support Forum on phpBB.com.',
'DB_USERNAME' => 'Database username',
'DB_TEST' => 'Test connection',
'DEFAULT_LANG' => 'Default board language',
***************
*** 185,195 ****
'INITIAL_CONFIG_EXPLAIN' => 'Now that install has determined your server can run phpBB you need to supply some specific information. If you do not know how to connect to your database please contact your hosting provider (in the first instance) or use the phpBB support forums. When entering data please ensure you check it thoroughly before continuing.',
'INSTALL_CONGRATS' => 'Congratulations!',
'INSTALL_CONGRATS_EXPLAIN' => '
! You have now successfully installed phpBB %1$s. From here, you have two options as to what to do with your newly installed phpBB3:</p>
<h2>Convert an existing board to phpBB3</h2>
! <p>The phpBB Unified Convertor Framework supports the conversion of phpBB 2.0.x and other board systems to phpBB3. If you have an existing board that you wish to convert, please <a href="%2$s">proceed on to the convertor</a>.</p>
<h2>Go live with your phpBB3!</h2>
! <p>Clicking the button below will take you to your Administration Control Panel (ACP). Take some time to examine the options available to you. Remember that help is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Documentation</a> and the <a href="http://www.phpbb.com/community/viewforum.php?f=46">support forums</a>, see the <a href="%3$s">README</a> for further information.</p><p><strong>Please now delete, move or rename the install directory before you use your board. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.</strong>',
'INSTALL_INTRO' => 'Welcome to Installation',
'INSTALL_INTRO_BODY' => 'With this option, it is possible to install phpBB3 onto your server.</p><p>In order to proceed, you will need your database settings. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:</p>
--- 185,195 ----
'INITIAL_CONFIG_EXPLAIN' => 'Now that install has determined your server can run phpBB you need to supply some specific information. If you do not know how to connect to your database please contact your hosting provider (in the first instance) or use the phpBB support forums. When entering data please ensure you check it thoroughly before continuing.',
'INSTALL_CONGRATS' => 'Congratulations!',
'INSTALL_CONGRATS_EXPLAIN' => '
! You have successfully installed phpBB %1$s. Please proceed by choosing one of the following opions:</p>
<h2>Convert an existing board to phpBB3</h2>
! <p>The phpBB Unified Convertor Framework supports the conversion of phpBB 2.0.x and other board systems to phpBB3. If you have an existing board that you wish to convert, please <a href="%2$s">proceed to the convertor</a>.</p>
<h2>Go live with your phpBB3!</h2>
! <p>Clicking the button below will take you to your Administration Control Panel (ACP). Take some time to examine the options available to you. Remember that help is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Documentation</a>, <a href="%3$s">README</a> and the <a href="http://www.phpbb.com/community/viewforum.php?f=46">Support Forums</a>.</p><p><strong>Please delete, move or rename the install directory before using your board. While this directory exists, only the Administration Control Panel (ACP) will be accessible.</strong>',
'INSTALL_INTRO' => 'Welcome to Installation',
'INSTALL_INTRO_BODY' => 'With this option, it is possible to install phpBB3 onto your server.</p><p>In order to proceed, you will need your database settings. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:</p>
Modified: branches/phpBB-3_0_0/phpBB/language/en/memberlist.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/memberlist.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/memberlist.php Thu Aug 6 10:12:21 2009
***************
*** 135,141 ****
'USER_BAN' => 'Banning',
'USER_FORUM' => 'User statistics',
'USER_LAST_REMINDED' => array(
! 0 => 'No reminder sent yet',
1 => '%1$d reminder sent<br />» %2$s',
),
'USER_ONLINE' => 'Online',
--- 135,141 ----
'USER_BAN' => 'Banning',
'USER_FORUM' => 'User statistics',
'USER_LAST_REMINDED' => array(
! 0 => 'No reminder sent at this time',
1 => '%1$d reminder sent<br />» %2$s',
),
'USER_ONLINE' => 'Online',
|
|
From: Yuriy R. <mar...@ph...> - 2009-08-06 05:18:12
|
Author: marshalrusty
Date: Thu Aug 6 06:17:25 2009
New Revision: 9932
Log:
#36475
Modified:
branches/phpBB-3_0_0/phpBB/language/en/install.php
Modified: branches/phpBB-3_0_0/phpBB/language/en/install.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/install.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/install.php Thu Aug 6 06:17:25 2009
***************
*** 560,574 ****
'USER_ACTIVE' => 'Active user',
'USER_INACTIVE' => 'Inactive user',
! 'VERSION_CHECK' => 'Version check',
! 'VERSION_CHECK_EXPLAIN' => 'Checks to see if the version of phpBB you are currently running is up to date.',
! 'VERSION_NOT_UP_TO_DATE' => 'Your version of phpBB is not up to date. Please continue the update process.',
! 'VERSION_NOT_UP_TO_DATE_ACP'=> 'Your version of phpBB is not up to date.<br />Below you will find a link to the release announcement for the latest version as well as instructions on how to perform the update.',
! 'VERSION_NOT_UP_TO_DATE_TITLE' => 'Your version of phpBB is not up to date.',
! 'VERSION_UP_TO_DATE' => 'Your installation is up to date, no updates are available for your version of phpBB. You may want to continue anyway to perform a file validity check.',
! 'VERSION_UP_TO_DATE_ACP' => 'Your installation is up to date, no updates are available for your version of phpBB. You do not need to update your installation.',
! 'VIEWING_FILE_CONTENTS' => 'Viewing file contents',
! 'VIEWING_FILE_DIFF' => 'Viewing file differences',
'WRONG_INFO_FILE_FORMAT' => 'Wrong info file format',
));
--- 560,574 ----
'USER_ACTIVE' => 'Active user',
'USER_INACTIVE' => 'Inactive user',
! 'VERSION_CHECK' => 'Version check',
! 'VERSION_CHECK_EXPLAIN' => 'Checks to see if your phpBB installation is up to date.',
! 'VERSION_NOT_UP_TO_DATE' => 'Your phpBB installation is not up to date. Please continue the update process.',
! 'VERSION_NOT_UP_TO_DATE_ACP' => 'Your phpBB installation is not up to date.<br />Below is a link to the release announcement, which contains more information as well as instructions on updating.',
! 'VERSION_NOT_UP_TO_DATE_TITLE' => 'Your phpBB installation is not up to date.',
! 'VERSION_UP_TO_DATE' => 'Your phpBB installation is up to date. Although there are no updates available at this time, you may continue in order to perform a file validity check.',
! 'VERSION_UP_TO_DATE_ACP' => 'Your phpBB installation is up to date. There are no updates available at this time.',
! 'VIEWING_FILE_CONTENTS' => 'Viewing file contents',
! 'VIEWING_FILE_DIFF' => 'Viewing file differences',
'WRONG_INFO_FILE_FORMAT' => 'Wrong info file format',
));
|
|
From: Joas S. <nic...@ph...> - 2009-08-05 15:29:32
|
Author: nickvergessen
Date: Wed Aug 5 16:28:46 2009
New Revision: 9931
Log:
fix r9713 for #36565
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php
branches/phpBB-3_0_0/phpBB/includes/search/fulltext_mysql.php
branches/phpBB-3_0_0/phpBB/includes/search/fulltext_native.php
branches/phpBB-3_0_0/phpBB/install/database_update.php
branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql
Modified: branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php (original)
--- branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php Wed Aug 5 16:28:46 2009
***************
*** 1305,1310 ****
--- 1305,1311 ----
'poster_ip' => array('INDEX', 'poster_ip'),
'poster_id' => array('INDEX', 'poster_id'),
'post_approved' => array('INDEX', 'post_approved'),
+ 'post_username' => array('INDEX', 'post_username'),
'tid_post_time' => array('INDEX', array('topic_id', 'post_time')),
),
);
Modified: branches/phpBB-3_0_0/phpBB/includes/search/fulltext_mysql.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/search/fulltext_mysql.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/search/fulltext_mysql.php Wed Aug 5 16:28:46 2009
***************
*** 444,451 ****
if (sizeof($author_ary) && $author_name)
{
// first one matches post of registered users, second one guests and deleted users
! $sql_author = ' AND (' . $db->sql_in_set('p.poster_id', $author_ary) . " AND p.post_username = ''";
! $sql_author .= ' OR p.poster_id = ' . ANONYMOUS . ' AND p.post_username ' . $author_name . ')';
}
else if (sizeof($author_ary))
{
--- 444,450 ----
if (sizeof($author_ary) && $author_name)
{
// first one matches post of registered users, second one guests and deleted users
! $sql_author = '(' . $db->sql_in_set('p.poster_id', array_diff($author_ary, array(ANONYMOUS)), false, true) . ' OR p.post_username ' . $author_name . ')';
}
else if (sizeof($author_ary))
{
***************
*** 553,560 ****
if ($author_name)
{
// first one matches post of registered users, second one guests and deleted users
! $sql_author = '(' . $db->sql_in_set('p.poster_id', $author_ary) . " AND p.post_username = ''";
! $sql_author .= ' OR p.poster_id = ' . ANONYMOUS . ' AND p.post_username ' . $author_name . ')';
}
else
{
--- 552,558 ----
if ($author_name)
{
// first one matches post of registered users, second one guests and deleted users
! $sql_author = '(' . $db->sql_in_set('p.poster_id', array_diff($author_ary, array(ANONYMOUS)), false, true) . ' OR p.post_username ' . $author_name . ')';
}
else
{
Modified: branches/phpBB-3_0_0/phpBB/includes/search/fulltext_native.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/search/fulltext_native.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/search/fulltext_native.php Wed Aug 5 16:28:46 2009
***************
*** 628,635 ****
if ($author_name)
{
// first one matches post of registered users, second one guests and deleted users
! $sql_author = '(' . $db->sql_in_set('p.poster_id', $author_ary) . " AND p.post_username = ''";
! $sql_author .= ' OR p.poster_id = ' . ANONYMOUS . ' AND p.post_username ' . $author_name . ')';
}
else
{
--- 628,634 ----
if ($author_name)
{
// first one matches post of registered users, second one guests and deleted users
! $sql_author = '(' . $db->sql_in_set('p.poster_id', array_diff($author_ary, array(ANONYMOUS)), false, true) . ' OR p.post_username ' . $author_name . ')';
}
else
{
***************
*** 840,847 ****
if ($author_name)
{
// first one matches post of registered users, second one guests and deleted users
! $sql_author = '(' . $db->sql_in_set('p.poster_id', $author_ary) . " AND p.post_username = ''";
! $sql_author .= ' OR p.poster_id = ' . ANONYMOUS . ' AND p.post_username ' . $author_name . ')';
}
else
{
--- 839,845 ----
if ($author_name)
{
// first one matches post of registered users, second one guests and deleted users
! $sql_author = '(' . $db->sql_in_set('p.poster_id', array_diff($author_ary, array(ANONYMOUS)), false, true) . ' OR p.post_username ' . $author_name . ')';
}
else
{
Modified: branches/phpBB-3_0_0/phpBB/install/database_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/database_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/database_update.php Wed Aug 5 16:28:46 2009
***************
*** 721,726 ****
--- 721,729 ----
'post_id' => array('post_id'),
'pm_id' => array('pm_id'),
),
+ POSTS_TABLE => array(
+ 'post_username' => array('post_username'),
+ ),
),
),
);
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql Wed Aug 5 16:28:46 2009
***************
*** 650,655 ****
--- 650,656 ----
CREATE INDEX phpbb_posts_poster_ip ON phpbb_posts(poster_ip);;
CREATE INDEX phpbb_posts_poster_id ON phpbb_posts(poster_id);;
CREATE INDEX phpbb_posts_post_approved ON phpbb_posts(post_approved);;
+ CREATE INDEX phpbb_posts_post_username ON phpbb_posts(post_username);;
CREATE INDEX phpbb_posts_tid_post_time ON phpbb_posts(topic_id, post_time);;
CREATE GENERATOR phpbb_posts_gen;;
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql Wed Aug 5 16:28:46 2009
***************
*** 803,808 ****
--- 803,811 ----
CREATE INDEX [post_approved] ON [phpbb_posts]([post_approved]) ON [PRIMARY]
GO
+ CREATE INDEX [post_username] ON [phpbb_posts]([post_username]) ON [PRIMARY]
+ GO
+
CREATE INDEX [tid_post_time] ON [phpbb_posts]([topic_id], [post_time]) ON [PRIMARY]
GO
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql Wed Aug 5 16:28:46 2009
***************
*** 459,464 ****
--- 459,465 ----
KEY poster_ip (poster_ip),
KEY poster_id (poster_id),
KEY post_approved (post_approved),
+ KEY post_username (post_username(255)),
KEY tid_post_time (topic_id, post_time)
);
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql Wed Aug 5 16:28:46 2009
***************
*** 459,464 ****
--- 459,465 ----
KEY poster_ip (poster_ip),
KEY poster_id (poster_id),
KEY post_approved (post_approved),
+ KEY post_username (post_username),
KEY tid_post_time (topic_id, post_time)
) CHARACTER SET `utf8` COLLATE `utf8_bin`;
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql Wed Aug 5 16:28:46 2009
***************
*** 879,884 ****
--- 879,886 ----
/
CREATE INDEX phpbb_posts_post_approved ON phpbb_posts (post_approved)
/
+ CREATE INDEX phpbb_posts_post_username ON phpbb_posts (post_username)
+ /
CREATE INDEX phpbb_posts_tid_post_time ON phpbb_posts (topic_id, post_time)
/
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql Wed Aug 5 16:28:46 2009
***************
*** 630,635 ****
--- 630,636 ----
CREATE INDEX phpbb_posts_poster_ip ON phpbb_posts (poster_ip);
CREATE INDEX phpbb_posts_poster_id ON phpbb_posts (poster_id);
CREATE INDEX phpbb_posts_post_approved ON phpbb_posts (post_approved);
+ CREATE INDEX phpbb_posts_post_username ON phpbb_posts (post_username);
CREATE INDEX phpbb_posts_tid_post_time ON phpbb_posts (topic_id, post_time);
/*
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql Wed Aug 5 16:28:46 2009
***************
*** 447,452 ****
--- 447,453 ----
CREATE INDEX phpbb_posts_poster_ip ON phpbb_posts (poster_ip);
CREATE INDEX phpbb_posts_poster_id ON phpbb_posts (poster_id);
CREATE INDEX phpbb_posts_post_approved ON phpbb_posts (post_approved);
+ CREATE INDEX phpbb_posts_post_username ON phpbb_posts (post_username);
CREATE INDEX phpbb_posts_tid_post_time ON phpbb_posts (topic_id, post_time);
# Table: 'phpbb_privmsgs'
|
|
From: Meik S. <acy...@ph...> - 2009-08-05 14:51:25
|
Author: acydburn
Date: Wed Aug 5 15:50:39 2009
New Revision: 9930
Log:
Fix Bug #46285 (drop index patch by Paul) - i hope the re-addition of the FULLTEXT index works. :o
If someone wants to try? :)
Modified:
branches/phpBB-3_0_0/phpBB/develop/mysql_upgrader.php
Modified: branches/phpBB-3_0_0/phpBB/develop/mysql_upgrader.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/develop/mysql_upgrader.php (original)
--- branches/phpBB-3_0_0/phpBB/develop/mysql_upgrader.php Wed Aug 5 15:50:39 2009
***************
*** 40,52 ****
$db->sql_freeresult($result);
! $mysql_indexer = false;
if (strtolower($row['Type']) === 'mediumtext')
{
$mysql_indexer = true;
}
echo "USE $dbname;$newline$newline";
--- 40,57 ----
$db->sql_freeresult($result);
! $mysql_indexer = $drop_index = false;
if (strtolower($row['Type']) === 'mediumtext')
{
$mysql_indexer = true;
}
+ if (strtolower($row['Key']) === 'mul')
+ {
+ $drop_index = true;
+ }
+
echo "USE $dbname;$newline$newline";
***************
*** 124,129 ****
--- 129,141 ----
// Create Table statement
$generator = $textimage = false;
+ // Do we need to DROP a fulltext index before we alter the table?
+ if ($table_name == ($prefix . 'posts') && $drop_index)
+ {
+ echo "ALTER TABLE {$table_name}{$newline}";
+ echo "DROP INDEX post_text,{$newline}DROP INDEX post_subject,{$newline}DROP INDEX post_content;{$newline}{$newline}";
+ }
+
$line = "ALTER TABLE {$table_name} $newline";
// Table specific so we don't get overlap
***************
*** 236,241 ****
--- 248,259 ----
$line .= "\tDEFAULT CHARSET=utf8 COLLATE=utf8_bin;$newline$newline";
echo $line . "$newline";
+
+ // Do we now need to re-add the fulltext index? ;)
+ if ($table_name == ($prefix . 'posts') && $drop_index)
+ {
+ echo "ALTER TABLE $table_name ADD FULLTEXT (post_subject), ADD FULLTEXT (post_text), ADD FULLTEXT post_content (post_subject, post_text){$newline}";
+ }
}
/**
|
|
From: Meik S. <acy...@ph...> - 2009-08-05 13:11:43
|
Author: acydburn
Date: Wed Aug 5 14:11:27 2009
New Revision: 9929
Log:
fix r9927 - of course isset()
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions_posting.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_posting.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_posting.php Wed Aug 5 14:11:27 2009
***************
*** 1685,1691 ****
}
// Mods are able to force approved/unapproved posts. True means the post is approved, false the post is unapproved
! if ($data['force_approved_state'])
{
$post_approval = ($data['force_approved_state']) ? 1 : 0;
}
--- 1685,1691 ----
}
// Mods are able to force approved/unapproved posts. True means the post is approved, false the post is unapproved
! if (isset($data['force_approved_state']))
{
$post_approval = ($data['force_approved_state']) ? 1 : 0;
}
|
|
From: Andreas F. <ba...@ph...> - 2009-08-05 13:06:42
|
Author: bantu
Date: Wed Aug 5 14:05:55 2009
New Revision: 9928
Log:
Fix Bug #48955 - Correctly extract column default value when exporting PostgreSQL tables.
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/acp/acp_database.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 Wed Aug 5 14:05:55 2009
***************
*** 188,193 ****
--- 188,194 ----
<li>[Fix] Adjust build_url() to not prepend $phpbb_root_path if path returned from redirect() is an URL. This fixes redirect issues with some installations and bridges. (Bug #47535)</li>
<li>[Fix] Do not mark global announcements as read if all topics in a forum become read (Bug #15729).</li>
<li>[Fix] Fix general error while registration, through undefined variable $config in validate_referer (Bug #49035 - Patch by wjvriend)</li>
+ <li>[Fix] Correctly extract column default value when exporting PostgreSQL tables. (Bug #48955)</li>
<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_database.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_database.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_database.php Wed Aug 5 14:05:55 2009
***************
*** 1157,1172 ****
AND (c.oid = d.adrelid)
AND d.adnum = " . $row['attnum'];
$def_res = $db->sql_query($sql_get_default);
! if (!$def_res)
{
unset($row['rowdefault']);
}
else
{
! $row['rowdefault'] = $db->sql_fetchfield('rowdefault', false, $def_res);
}
- $db->sql_freeresult($def_res);
if ($row['type'] == 'bpchar')
{
--- 1157,1173 ----
AND (c.oid = d.adrelid)
AND d.adnum = " . $row['attnum'];
$def_res = $db->sql_query($sql_get_default);
+ $def_row = $db->sql_fetchrow($def_res);
+ $db->sql_freeresult($def_res);
! if (empty($def_row))
{
unset($row['rowdefault']);
}
else
{
! $row['rowdefault'] = $def_row['rowdefault'];
}
if ($row['type'] == 'bpchar')
{
|
|
From: Meik S. <acy...@ph...> - 2009-08-05 13:01:17
|
Author: acydburn
Date: Wed Aug 5 14:01:03 2009
New Revision: 9927
Log:
submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/functions_posting.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Wed Aug 5 14:01:03 2009
***************
*** 188,193 ****
--- 188,194 ----
<li>[Fix] Adjust build_url() to not prepend $phpbb_root_path if path returned from redirect() is an URL. This fixes redirect issues with some installations and bridges. (Bug #47535)</li>
<li>[Fix] Do not mark global announcements as read if all topics in a forum become read (Bug #15729).</li>
<li>[Fix] Fix general error while registration, through undefined variable $config in validate_referer (Bug #49035 - Patch by wjvriend)</li>
+ <li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
<li>[Change] Template engine now permits to a limited extent variable includes.</li>
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_posting.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_posting.php Wed Aug 5 14:01:03 2009
***************
*** 1674,1687 ****
--- 1674,1695 ----
}
// This variable indicates if the user is able to post or put into the queue - it is used later for all code decisions regarding approval
+ // The variable name should be $post_approved, because it indicates if the post is approved or not
$post_approval = 1;
// Check the permissions for post approval. Moderators are not affected.
if (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id']))
{
+ // Post not approved, but in queue
$post_approval = 0;
}
+ // Mods are able to force approved/unapproved posts. True means the post is approved, false the post is unapproved
+ if ($data['force_approved_state'])
+ {
+ $post_approval = ($data['force_approved_state']) ? 1 : 0;
+ }
+
// Start the transaction here
$db->sql_transaction('begin');
|
|
From: Ruslan U. <rx...@ph...> - 2009-08-05 12:52:32
|
Author: rxu
Date: Wed Aug 5 13:51:48 2009
New Revision: 9926
Log:
Fix bug #15729 - Global announcements marked as read if all new topics in forum are viewed
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/functions.php
branches/phpBB-3_0_0/phpBB/includes/functions_display.php
branches/phpBB-3_0_0/phpBB/includes/functions_posting.php
branches/phpBB-3_0_0/phpBB/viewforum.php
branches/phpBB-3_0_0/phpBB/viewtopic.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Wed Aug 5 13:51:48 2009
***************
*** 186,191 ****
--- 186,192 ----
<li>[Fix] Do not try to create thumbnails for images we cannot open properly. (Bug #48695)</li>
<li>[Fix] Apply locale-independent basename() to attachment filenames. New function added: utf8_basename(). (Bug #43335 - Patch by ocean=Yohsuke)</li>
<li>[Fix] Adjust build_url() to not prepend $phpbb_root_path if path returned from redirect() is an URL. This fixes redirect issues with some installations and bridges. (Bug #47535)</li>
+ <li>[Fix] Do not mark global announcements as read if all topics in a forum become read (Bug #15729).</li>
<li>[Fix] Fix general error while registration, through undefined variable $config in validate_referer (Bug #49035 - Patch by wjvriend)</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
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 Wed Aug 5 13:51:48 2009
***************
*** 1227,1233 ****
}
// Add 0 to forums array to mark global announcements correctly
! $forum_id[] = 0;
if ($config['load_db_lastread'] && $user->data['is_registered'])
{
--- 1227,1233 ----
}
// Add 0 to forums array to mark global announcements correctly
! // $forum_id[] = 0;
if ($config['load_db_lastread'] && $user->data['is_registered'])
{
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_display.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_display.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_display.php Wed Aug 5 13:51:48 2009
***************
*** 251,256 ****
--- 251,258 ----
}
else
{
+ // Add 0 to forums array to mark global announcements correctly
+ $forum_ids[] = 0;
markread('topics', $forum_ids);
$message = sprintf($user->lang['RETURN_FORUM'], '<a href="' . $redirect . '">', '</a>');
}
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_posting.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_posting.php Wed Aug 5 13:51:48 2009
***************
*** 2531,2537 ****
// Mark this topic as read
// We do not use post_time here, this is intended (post_time can have a date in the past if editing a message)
! markread('topic', $data['forum_id'], $data['topic_id'], time());
//
if ($config['load_db_lastread'] && $user->data['is_registered'])
--- 2531,2537 ----
// Mark this topic as read
// We do not use post_time here, this is intended (post_time can have a date in the past if editing a message)
! markread('topic', (($topic_type == POST_GLOBAL) ? 0 : $data['forum_id']), $data['topic_id'], time());
//
if ($config['load_db_lastread'] && $user->data['is_registered'])
***************
*** 2539,2545 ****
$sql = 'SELECT mark_time
FROM ' . FORUMS_TRACK_TABLE . '
WHERE user_id = ' . $user->data['user_id'] . '
! AND forum_id = ' . $data['forum_id'];
$result = $db->sql_query($sql);
$f_mark_time = (int) $db->sql_fetchfield('mark_time');
$db->sql_freeresult($result);
--- 2539,2545 ----
$sql = 'SELECT mark_time
FROM ' . FORUMS_TRACK_TABLE . '
WHERE user_id = ' . $user->data['user_id'] . '
! AND forum_id = ' . (($topic_type == POST_GLOBAL) ? 0 : $data['forum_id']);
$result = $db->sql_query($sql);
$f_mark_time = (int) $db->sql_fetchfield('mark_time');
$db->sql_freeresult($result);
***************
*** 2552,2565 ****
if (($config['load_db_lastread'] && $user->data['is_registered']) || $config['load_anon_lastread'] || $user->data['is_registered'])
{
// Update forum info
! $sql = 'SELECT forum_last_post_time
! FROM ' . FORUMS_TABLE . '
! WHERE forum_id = ' . $data['forum_id'];
$result = $db->sql_query($sql);
$forum_last_post_time = (int) $db->sql_fetchfield('forum_last_post_time');
$db->sql_freeresult($result);
! update_forum_tracking_info($data['forum_id'], $forum_last_post_time, $f_mark_time, false);
}
// Send Notifications
--- 2552,2574 ----
if (($config['load_db_lastread'] && $user->data['is_registered']) || $config['load_anon_lastread'] || $user->data['is_registered'])
{
// Update forum info
! if ($topic_type == POST_GLOBAL)
! {
! $sql = 'SELECT MAX(topic_last_post_time) as forum_last_post_time
! FROM ' . TOPICS_TABLE . '
! WHERE forum_id = 0';
! }
! else
! {
! $sql = 'SELECT forum_last_post_time
! FROM ' . FORUMS_TABLE . '
! WHERE forum_id = ' . $data['forum_id'];
! }
$result = $db->sql_query($sql);
$forum_last_post_time = (int) $db->sql_fetchfield('forum_last_post_time');
$db->sql_freeresult($result);
! update_forum_tracking_info((($topic_type == POST_GLOBAL) ? 0 : $data['forum_id']), $forum_last_post_time, $f_mark_time, false);
}
// Send Notifications
Modified: branches/phpBB-3_0_0/phpBB/viewforum.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/viewforum.php (original)
--- branches/phpBB-3_0_0/phpBB/viewforum.php Wed Aug 5 13:51:48 2009
***************
*** 179,185 ****
$token = request_var('hash', '');
if (check_link_hash($token, 'global'))
{
! markread('topics', $forum_id);
}
$redirect_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id);
meta_refresh(3, $redirect_url);
--- 179,186 ----
$token = request_var('hash', '');
if (check_link_hash($token, 'global'))
{
! // Add 0 to forums array to mark global announcements correctly
! markread('topics', array($forum_id, 0));
}
$redirect_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id);
meta_refresh(3, $redirect_url);
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 Wed Aug 5 13:51:48 2009
***************
*** 1582,1591 ****
// Only mark topic if it's currently unread. Also make sure we do not set topic tracking back if earlier pages are viewed.
if (isset($topic_tracking_info[$topic_id]) && $topic_data['topic_last_post_time'] > $topic_tracking_info[$topic_id] && $max_post_time > $topic_tracking_info[$topic_id])
{
! markread('topic', $forum_id, $topic_id, $max_post_time);
// Update forum info
! $all_marked_read = update_forum_tracking_info($forum_id, $topic_data['forum_last_post_time'], (isset($topic_data['forum_mark_time'])) ? $topic_data['forum_mark_time'] : false, false);
}
else
{
--- 1582,1591 ----
// Only mark topic if it's currently unread. Also make sure we do not set topic tracking back if earlier pages are viewed.
if (isset($topic_tracking_info[$topic_id]) && $topic_data['topic_last_post_time'] > $topic_tracking_info[$topic_id] && $max_post_time > $topic_tracking_info[$topic_id])
{
! markread('topic', (($topic_data['topic_type'] == POST_GLOBAL) ? 0 : $forum_id), $topic_id, $max_post_time);
// Update forum info
! $all_marked_read = update_forum_tracking_info((($topic_data['topic_type'] == POST_GLOBAL) ? 0 : $forum_id), $topic_data['forum_last_post_time'], (isset($topic_data['forum_mark_time'])) ? $topic_data['forum_mark_time'] : false, false);
}
else
{
|
|
From: Meik S. <acy...@ph...> - 2009-08-05 12:48:51
|
Author: acydburn
Date: Wed Aug 5 13:47:56 2009
New Revision: 9925
Log:
update mysql_upgrader
Modified:
branches/phpBB-3_0_0/phpBB/develop/mysql_upgrader.php
Modified: branches/phpBB-3_0_0/phpBB/develop/mysql_upgrader.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/develop/mysql_upgrader.php (original)
--- branches/phpBB-3_0_0/phpBB/develop/mysql_upgrader.php Wed Aug 5 13:47:56 2009
***************
*** 804,809 ****
--- 804,810 ----
'message_edit_count' => array('USINT', 0),
'to_address' => array('TEXT_UNI', ''),
'bcc_address' => array('TEXT_UNI', ''),
+ 'message_reported' => array('BOOL', 0),
),
'PRIMARY_KEY' => 'msg_id',
'KEYS' => array(
***************
*** 879,884 ****
--- 880,886 ----
'field_validation' => array('VCHAR_UNI:20', ''),
'field_required' => array('BOOL', 0),
'field_show_on_reg' => array('BOOL', 0),
+ 'field_show_on_vt' => array('BOOL', 0),
'field_show_profile' => array('BOOL', 0),
'field_hide' => array('BOOL', 0),
'field_no_view' => array('BOOL', 0),
***************
*** 937,942 ****
--- 939,945 ----
'report_id' => array('UINT', NULL, 'auto_increment'),
'reason_id' => array('USINT', 0),
'post_id' => array('UINT', 0),
+ 'pm_id' => array('UINT', 0),
'user_id' => array('UINT', 0),
'user_notify' => array('BOOL', 0),
'report_closed' => array('BOOL', 0),
***************
*** 944,949 ****
--- 947,956 ----
'report_text' => array('MTEXT_UNI', ''),
),
'PRIMARY_KEY' => 'report_id',
+ 'KEYS' => array(
+ 'post_id' => array('INDEX', 'post_id'),
+ 'pm_id' => array('INDEX', 'pm_id'),
+ ),
);
$schema_data['phpbb_reports_reasons'] = array(
***************
*** 1326,1331 ****
--- 1333,1340 ----
'user_newpasswd' => array('VCHAR_UNI:40', ''),
'user_form_salt' => array('VCHAR_UNI:32', ''),
'user_new' => array('BOOL', 1),
+ 'user_reminded' => array('TINT:4', 0),
+ 'user_reminded_time' => array('TIMESTAMP', 0),
),
'PRIMARY_KEY' => 'user_id',
'KEYS' => array(
|
|
From: Henry S. <kel...@ph...> - 2009-08-05 12:02:38
|
Author: Kellanved
Date: Wed Aug 5 13:02:18 2009
New Revision: 9924
Log:
log general errors in cron, images and when debug is enabled
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions.php
branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Wed Aug 5 13:02:18 2009
***************
*** 3505,3510 ****
--- 3505,3518 ----
$l_notify = '<p>Please notify the board administrator or webmaster: <a href="mailto:' . $config['board_contact'] . '">' . $config['board_contact'] . '</a></p>';
}
}
+
+ if (defined('DEBUG') || defined('IN_CRON') || defined('IMAGE_OUTPUT'))
+ {
+ // let's avoid loops
+ $db->sql_return_on_error(true);
+ add_log('critical', 'LOG_GENERAL_ERROR', $msg_title, $msg_text);
+ $db->sql_return_on_error(false);
+ }
garbage_collection();
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 Wed Aug 5 13:02:18 2009
***************
*** 562,567 ****
--- 562,569 ----
'LOG_FORUM_MOVE_UP' => '<strong>Moved forum</strong> %1$s <strong>above</strong> %2$s',
'LOG_FORUM_SYNC' => '<strong>Re-synchronised forum</strong><br />» %s',
+ 'LOG_GENERAL_ERROR' => '<strong>A general error occured</strong>: %1$s <br />» %2$s',
+
'LOG_GROUP_CREATED' => '<strong>New usergroup created</strong><br />» %s',
'LOG_GROUP_DEFAULTS' => '<strong>Group â%1$sâ made default for members</strong><br />» %2$s',
'LOG_GROUP_DELETE' => '<strong>Usergroup deleted</strong><br />» %s',
|
|
From: Henry S. <kel...@ph...> - 2009-08-04 15:57:54
|
Author: Kellanved
Date: Tue Aug 4 16:57:38 2009
New Revision: 9923
Log:
and for pseudocron too (to conisder: log db errors to debug faulty cron jobs)
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Tue Aug 4 16:57:38 2009
***************
*** 3468,3474 ****
echo '<b>[phpBB Debug] PHP Notice</b>: in file <b>' . $errfile . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br />' . "\n";
// we are writing an image - the user won't see the debug, so let's place it in the log
! if (defined('IMAGE_OUTPUT'))
{
add_log('critical', 'LOG_IMAGE_GENERATION_ERROR', $errfile, $errline, $msg_text);
}
--- 3468,3474 ----
echo '<b>[phpBB Debug] PHP Notice</b>: in file <b>' . $errfile . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br />' . "\n";
// we are writing an image - the user won't see the debug, so let's place it in the log
! if (defined('IMAGE_OUTPUT') || defined('IN_CRON'))
{
add_log('critical', 'LOG_IMAGE_GENERATION_ERROR', $errfile, $errline, $msg_text);
}
***************
*** 3614,3620 ****
exit_handler();
break;
! // PHP4 comptibility
case E_DEPRECATED:
return true;
break;
--- 3614,3620 ----
exit_handler();
break;
! // PHP4 compatibility
case E_DEPRECATED:
return true;
break;
|
7 messages has been excluded from this view by a project administrator.
