Menu
▾
▴
phpbb-checkins — If you subscribed to this list, please update: code.phpbb.com
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(193) |
Nov
(393) |
Dec
(347) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(401) |
Feb
(232) |
Mar
(343) |
Apr
(129) |
May
(129) |
Jun
(116) |
Jul
(189) |
Aug
(129) |
Sep
(68) |
Oct
(172) |
Nov
(298) |
Dec
(148) |
| 2003 |
Jan
(264) |
Feb
(210) |
Mar
(322) |
Apr
(309) |
May
(234) |
Jun
(188) |
Jul
(215) |
Aug
(161) |
Sep
(234) |
Oct
(163) |
Nov
(110) |
Dec
(7) |
| 2004 |
Jan
(95) |
Feb
(107) |
Mar
(55) |
Apr
(3) |
May
(49) |
Jun
(35) |
Jul
(57) |
Aug
(43) |
Sep
(56) |
Oct
(40) |
Nov
(25) |
Dec
(21) |
| 2005 |
Jan
(93) |
Feb
(25) |
Mar
(22) |
Apr
(72) |
May
(45) |
Jun
(24) |
Jul
(29) |
Aug
(20) |
Sep
(50) |
Oct
(93) |
Nov
(69) |
Dec
(183) |
| 2006 |
Jan
(185) |
Feb
(143) |
Mar
(402) |
Apr
(260) |
May
(322) |
Jun
(367) |
Jul
(234) |
Aug
(299) |
Sep
(206) |
Oct
(288) |
Nov
(338) |
Dec
(307) |
| 2007 |
Jan
(296) |
Feb
(250) |
Mar
(261) |
Apr
(434) |
May
(539) |
Jun
(274) |
Jul
(440) |
Aug
(190) |
Sep
(128) |
Oct
(249) |
Nov
(86) |
Dec
(51) |
| 2008 |
Jan
(177) |
Feb
(67) |
Mar
(61) |
Apr
(48) |
May
(56) |
Jun
(97) |
Jul
(60) |
Aug
(64) |
Sep
(151) |
Oct
(79) |
Nov
(109) |
Dec
(123) |
| 2009 |
Jan
(70) |
Feb
(70) |
Mar
(73) |
Apr
(80) |
May
(22) |
Jun
(193) |
Jul
(191) |
Aug
(181) |
Sep
(120) |
Oct
(48) |
Nov
(24) |
Dec
|
|
From: Meik S. <acy...@ph...> - 2009-09-04 10:21:35
|
Author: acydburn
Date: Fri Sep 4 11:20:47 2009
New Revision: 10097
Log:
only whitespace changes
Modified:
branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php Fri Sep 4 11:20:47 2009
***************
*** 551,561 ****
delete_pm($user_id, $msg_ids, PRIVMSGS_OUTBOX);
add_log('admin', 'LOG_USER_DEL_OUTBOX', $user_row['username']);
!
$lang = 'EMPTIED';
}
$db->sql_freeresult($result);
!
trigger_error($user->lang['USER_OUTBOX_' . $lang] . adm_back_link($this->u_action . '&u=' . $user_id));
}
else
--- 551,561 ----
delete_pm($user_id, $msg_ids, PRIVMSGS_OUTBOX);
add_log('admin', 'LOG_USER_DEL_OUTBOX', $user_row['username']);
!
$lang = 'EMPTIED';
}
$db->sql_freeresult($result);
!
trigger_error($user->lang['USER_OUTBOX_' . $lang] . adm_back_link($this->u_action . '&u=' . $user_id));
}
else
***************
*** 725,731 ****
trigger_error($user->lang['USER_POSTS_MOVED'] . adm_back_link($this->u_action . '&u=' . $user_id));
break;
!
case 'leave_nr':
if (confirm_box(true))
--- 725,731 ----
trigger_error($user->lang['USER_POSTS_MOVED'] . adm_back_link($this->u_action . '&u=' . $user_id));
break;
!
case 'leave_nr':
if (confirm_box(true))
|
|
From: Meik S. <acy...@ph...> - 2009-09-04 10:19:51
|
Author: acydburn
Date: Fri Sep 4 11:19:04 2009
New Revision: 10096
Log:
XHTML compatible viewforum_body.html again (thanks Raimon for pointing this out)
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewforum_body.html
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewforum_body.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewforum_body.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewforum_body.html Fri Sep 4 11:19:04 2009
***************
*** 3,13 ****
<h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
<!-- IF FORUM_DESC or MODERATORS or U_MCP -->
! <p>
<!-- NOTE: remove the style="display: none" when you want to have the forum description on the forum body -->
<!-- IF FORUM_DESC --><div style="display: none !important;">{FORUM_DESC}<br /></div><!-- ENDIF -->
<!-- IF MODERATORS --><strong><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->:</strong> {MODERATORS}<!-- ENDIF -->
! </p>
<!-- ENDIF -->
<!-- IF S_FORUM_RULES -->
--- 3,13 ----
<h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
<!-- IF FORUM_DESC or MODERATORS or U_MCP -->
! <div>
<!-- NOTE: remove the style="display: none" when you want to have the forum description on the forum body -->
<!-- IF FORUM_DESC --><div style="display: none !important;">{FORUM_DESC}<br /></div><!-- ENDIF -->
<!-- IF MODERATORS --><strong><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->:</strong> {MODERATORS}<!-- ENDIF -->
! </div>
<!-- ENDIF -->
<!-- IF S_FORUM_RULES -->
|
|
From: Henry S. <kel...@ph...> - 2009-09-03 20:07:41
|
Author: Kellanved
Date: Thu Sep 3 21:06:57 2009
New Revision: 10095
Log:
#50485
Modified:
branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_register.php
Modified: branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_register.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_register.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_register.php Thu Sep 3 21:06:57 2009
***************
*** 68,73 ****
--- 68,74 ----
$user->lang_name = $user_lang = $use_lang;
$user->lang = array();
+ $user->data['user_lang'] = $user->lang_name;
$user->add_lang(array('common', 'ucp'));
}
else
|
|
From: Andreas F. <ba...@ph...> - 2009-09-03 14:03:02
|
Author: bantu
Date: Thu Sep 3 14:44:16 2009
New Revision: 10092
Log:
Bug #39505, r9677 - Add integer casting and allow array to be empty. Unset array when no longer needed.
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions_privmsgs.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_privmsgs.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_privmsgs.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_privmsgs.php Thu Sep 3 14:44:16 2009
***************
*** 1707,1714 ****
$recipients = array();
while ($row = $db->sql_fetchrow($result))
{
! $recipients[] = $row['user_id'];
! $recipients[] = $row['author_id'];
}
$db->sql_freeresult($result);
$recipients = array_unique($recipients);
--- 1707,1714 ----
$recipients = array();
while ($row = $db->sql_fetchrow($result))
{
! $recipients[] = (int) $row['user_id'];
! $recipients[] = (int) $row['author_id'];
}
$db->sql_freeresult($result);
$recipients = array_unique($recipients);
***************
*** 1719,1727 ****
WHERE t.msg_id = p.msg_id
AND p.author_id = u.user_id
AND t.folder_id NOT IN (' . PRIVMSGS_NO_BOX . ', ' . PRIVMSGS_HOLD_BOX . ')
! AND ' . $db->sql_in_set('t.author_id', $recipients) . "
AND t.user_id = $user_id";
if (!$message_row['root_level'])
{
$sql .= " AND (p.root_level = $msg_id OR (p.root_level = 0 AND p.msg_id = $msg_id))";
--- 1719,1730 ----
WHERE t.msg_id = p.msg_id
AND p.author_id = u.user_id
AND t.folder_id NOT IN (' . PRIVMSGS_NO_BOX . ', ' . PRIVMSGS_HOLD_BOX . ')
! AND ' . $db->sql_in_set('t.author_id', $recipients, false, true) . "
AND t.user_id = $user_id";
+ // We no longer need those.
+ unset($recipients);
+
if (!$message_row['root_level'])
{
$sql .= " AND (p.root_level = $msg_id OR (p.root_level = 0 AND p.msg_id = $msg_id))";
|
|
From: Henry S. <kel...@ph...> - 2009-09-03 14:00:22
|
Author: Kellanved
Date: Thu Sep 3 14:59:31 2009
New Revision: 10094
Log:
#50675 ; also don't reset the captcha on login
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 Thu Sep 3 14:59:31 2009
***************
*** 2082,2088 ****
}
$on_page = floor($start_item / $per_page) + 1;
! $url_delim = (strpos($base_url, '?') === false) ? '?' : '&';
$page_string = ($on_page == 1) ? '<strong>1</strong>' : '<a href="' . $base_url . '">1</a>';
--- 2082,2088 ----
}
$on_page = floor($start_item / $per_page) + 1;
! $url_delim = (strpos($base_url, '?') === false) ? '?' : ((strpos($base_url, '?') === strlen($base_url) - 1) ? '' : '&');
$page_string = ($on_page == 1) ? '<strong>1</strong>' : '<a href="' . $base_url . '">1</a>';
***************
*** 2949,2955 ****
$captcha = phpbb_captcha_factory::get_instance($config['captcha_plugin']);
$captcha->init(CONFIRM_LOGIN);
! $captcha->reset();
$template->assign_vars(array(
'CAPTCHA_TEMPLATE' => $captcha->get_template(),
--- 2949,2955 ----
$captcha = phpbb_captcha_factory::get_instance($config['captcha_plugin']);
$captcha->init(CONFIRM_LOGIN);
! // $captcha->reset();
$template->assign_vars(array(
'CAPTCHA_TEMPLATE' => $captcha->get_template(),
|
|
From: Andreas F. <ba...@ph...> - 2009-09-03 13:56:48
|
Author: bantu
Date: Thu Sep 3 14:56:03 2009
New Revision: 10093
Log:
Some rewording, some typo fixes, some whitespace changes.
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.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 Thu Sep 3 14:56:03 2009
***************
*** 104,110 ****
<li>[Fix] Fix dynamic config update routine error if firebird is used (Bug #46315)</li>
<li>[Fix] Allow friends/foes to be added and removed at the same time. (Bug #46255 - Patch by bantu)</li>
<li>[Fix] Only change topic/post icon if icons are enabled and user is allowed to. (Bug #46355 - Patch by bantu)</li>
! <li>[Fix] Fix saving custom profile fields in ACP if Oracle used (Bug #46015)</li>
<li>[Fix] Make view_log() more resilient to corrupt serialized data. (Bug #46545)</li>
<li>[Fix] Show error if hostname lookup doesn't return a valid IP address when banning. (Bug #45585 - Patch by bantu)</li>
<li>[Fix] Fix incorrect layout when loading private message draft. (Bug #38435 - Patch by nickvergessen)</li>
--- 104,110 ----
<li>[Fix] Fix dynamic config update routine error if firebird is used (Bug #46315)</li>
<li>[Fix] Allow friends/foes to be added and removed at the same time. (Bug #46255 - Patch by bantu)</li>
<li>[Fix] Only change topic/post icon if icons are enabled and user is allowed to. (Bug #46355 - Patch by bantu)</li>
! <li>[Fix] Fix saving custom profile fields in ACP if Oracle is used. (Bug #46015)</li>
<li>[Fix] Make view_log() more resilient to corrupt serialized data. (Bug #46545)</li>
<li>[Fix] Show error if hostname lookup doesn't return a valid IP address when banning. (Bug #45585 - Patch by bantu)</li>
<li>[Fix] Fix incorrect layout when loading private message draft. (Bug #38435 - Patch by nickvergessen)</li>
***************
*** 130,136 ****
<li>[Fix] Fix reapply_sid() to correctly strip session id in certain circumstances (Bug #43125 - Patch by leviatan21)</li>
<li>[Fix] Correctly state why one language pack is marked with an asterisk in the ACP. (Bug #37565 - Patch by bantu)</li>
<li>[Fix] Correctly check if install directory is still present. (Bug #46965 - Patch by rxu)</li>
! <li>[Fix] Correct banned user behaviour when "force password change" is enabled (Bug #47145 - Patch by nickvergessen and leviatan21 )</li>
<li>[Fix] Correctly display ACP logs options, without permission to clear logs. (Bug #24155 - Patch by leviatan21)</li>
<li>[Fix] Display topic icons in MCP forum view again (only prosilver).</li>
<li>[Fix] Properly display post status messages in topic when post is reported and unapproved (Bug #44455 - Patch by leviatan21)</li>
--- 130,136 ----
<li>[Fix] Fix reapply_sid() to correctly strip session id in certain circumstances (Bug #43125 - Patch by leviatan21)</li>
<li>[Fix] Correctly state why one language pack is marked with an asterisk in the ACP. (Bug #37565 - Patch by bantu)</li>
<li>[Fix] Correctly check if install directory is still present. (Bug #46965 - Patch by rxu)</li>
! <li>[Fix] Correct banned user behaviour when "force password change" is enabled (Bug #47145 - Patch by nickvergessen and leviatan21)</li>
<li>[Fix] Correctly display ACP logs options, without permission to clear logs. (Bug #24155 - Patch by leviatan21)</li>
<li>[Fix] Display topic icons in MCP forum view again (only prosilver).</li>
<li>[Fix] Properly display post status messages in topic when post is reported and unapproved (Bug #44455 - Patch by leviatan21)</li>
***************
*** 181,187 ****
<li>[Fix] Do not send private message back to sender if sender is in the same group the private message was sent to.</li>
<li>[Fix] Correctly add user to a group making it a default one. (Bug #48345 - Patch by rxu)</li>
<li>[Fix] Add log entry when copying forum permissions.</li>
! <li>[Fix] Min/max characters per posts also affects polls option (Bug #47295 - Patch by nickvergessen)</li>
<li>[Fix] Correctly log action when users request to join a group (Bug #37585 - Patch by nickvergessen)</li>
<li>[Fix] Do not try to create thumbnails for images we cannot open properly. (Bug #48695)</li>
<li>[Fix] Apply locale-independent basename() to attachment filenames. New function added: utf8_basename(). (Bug #43335 - Patch by ocean=Yohsuke)</li>
--- 181,187 ----
<li>[Fix] Do not send private message back to sender if sender is in the same group the private message was sent to.</li>
<li>[Fix] Correctly add user to a group making it a default one. (Bug #48345 - Patch by rxu)</li>
<li>[Fix] Add log entry when copying forum permissions.</li>
! <li>[Fix] Min/max characters per posts no longer affects poll options (Bug #47295 - Patch by nickvergessen)</li>
<li>[Fix] Correctly log action when users request to join a group (Bug #37585 - Patch by nickvergessen)</li>
<li>[Fix] Do not try to create thumbnails for images we cannot open properly. (Bug #48695)</li>
<li>[Fix] Apply locale-independent basename() to attachment filenames. New function added: utf8_basename(). (Bug #43335 - Patch by ocean=Yohsuke)</li>
***************
*** 202,212 ****
<li>[Fix] Make sure only logs for existing users are displayed and user-specific logs removed on user deletion. (Bug #49855)</li>
<li>[Fix] Only show "Add friend" and "Add foe" links if the specific module is enabled. (Bug #50475)</li>
<li>[Fix] Correctly display list items in forum description in prosilver and administration. (Bug #48055 - Patch by leviatan21)</li>
! <li>[Fix] Fix handling of bookmarks and subscriptions on "split topcis", "merge topics" and "merge posts". (Bug #50035)</li>
<li>[Fix] Only embed cron.php if there is no cron lock present to reduce overhead. (Bug #45725 - Patch by TerryE)</li>
<li>[Fix] Add header gradient back into subsilver2 but keep site logo easily replaceable with smaller and bigger ones. (Bug #11142 - Patch by dark/Rain and Raimon)</li>
! <li>[Fix] Activation email not sent from user settings (Bug #43145)</li>
! <li>[Fix] Resend activation e-mail link inappropriate if using Admin activation (Bug #44375 - Patch by bbrunnrman)</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>
--- 202,212 ----
<li>[Fix] Make sure only logs for existing users are displayed and user-specific logs removed on user deletion. (Bug #49855)</li>
<li>[Fix] Only show "Add friend" and "Add foe" links if the specific module is enabled. (Bug #50475)</li>
<li>[Fix] Correctly display list items in forum description in prosilver and administration. (Bug #48055 - Patch by leviatan21)</li>
! <li>[Fix] Fix handling of bookmarks and subscriptions on "split topics", "merge topics" and "merge posts". (Bug #50035)</li>
<li>[Fix] Only embed cron.php if there is no cron lock present to reduce overhead. (Bug #45725 - Patch by TerryE)</li>
<li>[Fix] Add header gradient back into subsilver2 but keep site logo easily replaceable with smaller and bigger ones. (Bug #11142 - Patch by dark/Rain and Raimon)</li>
! <li>[Fix] Send activation email when activating user from user settings. (Bug #43145)</li>
! <li>[Fix] Do not show resend activation email link when using admin activation. (Bug #44375 - Patch by bbrunnrman)</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>
***************
*** 220,227 ****
<li>[Change] INCLUDEPHP not depending on phpbb_root_path (Bug #45805 - Patch by nickvergessen)</li>
<li>[Change] Ability to fetch moderators with get_moderators() even if load_moderators setting is off. (Bug #35955)</li>
<li>[Change] "Post details" links with image in MCP. (Bug #39845 - Patch by leviatan21)</li>
! <li>[Change] Pm history only shows pms of the receipts you currently reply to (Bug #39505 - Patch by nickvergessen)</li>
! <li>[Change] Add quote-button for own pm's in pm-history (Bug #37285 - Patch by nickvergessen)</li>
<li>[Change] Fetch requested cookie variables directly from cookie super global. (Bug #47785)</li>
<li>[Change] Add confirmation for deactivating styles (Bug #14304 - Patch by leviatan21)</li>
<li>[Change] Add confirmation for deactivating language packs (Patch by leviatan21)</li>
--- 220,227 ----
<li>[Change] INCLUDEPHP not depending on phpbb_root_path (Bug #45805 - Patch by nickvergessen)</li>
<li>[Change] Ability to fetch moderators with get_moderators() even if load_moderators setting is off. (Bug #35955)</li>
<li>[Change] "Post details" links with image in MCP. (Bug #39845 - Patch by leviatan21)</li>
! <li>[Change] PM history now only shows PMs of users you currently reply to. (Bug #39505 - Patch by nickvergessen)</li>
! <li>[Change] Show quote button for own PMs in PM history. (Bug #37285 - Patch by nickvergessen)</li>
<li>[Change] Fetch requested cookie variables directly from cookie super global. (Bug #47785)</li>
<li>[Change] Add confirmation for deactivating styles (Bug #14304 - Patch by leviatan21)</li>
<li>[Change] Add confirmation for deactivating language packs (Patch by leviatan21)</li>
***************
*** 270,276 ****
<li>[Feature] Add bare-bones quick-reply editor to viewtopic.</li>
<li>[Feature] Detect when a post has been altered by someone else while editing. (Patch by bantu)</li>
<li>[Feature] Add unread posts quick search option (Bug #46765 - Patch by rxu)</li>
! <li>[Feature] Add option to disable remote upload avatars (Bug #45375 - Patch by nickvergessen)</li>
<li>[Feature] Ability to delete warnings and keep warnings permanently (Bug #43375 - Patch by nickvergessen)</li>
<li>[Feature] Ability to empty a user's outbox from the user ACP quick tools.</li>
<li>[Feature] Ability to search ACP / MCP logs</li>
--- 270,276 ----
<li>[Feature] Add bare-bones quick-reply editor to viewtopic.</li>
<li>[Feature] Detect when a post has been altered by someone else while editing. (Patch by bantu)</li>
<li>[Feature] Add unread posts quick search option (Bug #46765 - Patch by rxu)</li>
! <li>[Feature] Add option to disable avatar uploads from remote locations. (Bug #45375 - Patch by nickvergessen)</li>
<li>[Feature] Ability to delete warnings and keep warnings permanently (Bug #43375 - Patch by nickvergessen)</li>
<li>[Feature] Ability to empty a user's outbox from the user ACP quick tools.</li>
<li>[Feature] Ability to search ACP / MCP logs</li>
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php Thu Sep 3 14:56:03 2009
***************
*** 95,101 ****
$this->select_question();
}
}
!
/**
* API function
*/
--- 95,101 ----
$this->select_question();
}
}
!
/**
* API function
*/
***************
*** 442,448 ****
$this->load_answer();
}
!
/**
* Look up everything we need and populate the instance variables.
*/
--- 442,448 ----
$this->load_answer();
}
!
/**
* Look up everything we need and populate the instance variables.
*/
***************
*** 812,818 ****
function acp_add_question($data)
{
global $db, $cache;
!
$langs = $this->get_languages();
$question_ary = $data;
--- 812,818 ----
function acp_add_question($data)
{
global $db, $cache;
!
$langs = $this->get_languages();
$question_ary = $data;
|
|
From: Andreas F. <ba...@ph...> - 2009-09-03 12:47:03
|
Author: bantu
Date: Thu Sep 3 13:45:46 2009
New Revision: 10091
Log:
Some cleanup.
Modified:
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php Thu Sep 3 13:45:46 2009
***************
*** 17,28 ****
}
global $table_prefix;
define('CAPTCHA_QUESTIONS_TABLE', $table_prefix . 'captcha_questions');
define('CAPTCHA_ANSWERS_TABLE', $table_prefix . 'captcha_answers');
define('CAPTCHA_QA_CONFIRM_TABLE', $table_prefix . 'qa_confirm');
-
-
/**
* And now to something completely different. Let's make a captcha without extending the abstract class.
* QA CAPTCHA sample implementation
--- 17,27 ----
}
global $table_prefix;
+
define('CAPTCHA_QUESTIONS_TABLE', $table_prefix . 'captcha_questions');
define('CAPTCHA_ANSWERS_TABLE', $table_prefix . 'captcha_answers');
define('CAPTCHA_QA_CONFIRM_TABLE', $table_prefix . 'qa_confirm');
/**
* And now to something completely different. Let's make a captcha without extending the abstract class.
* QA CAPTCHA sample implementation
***************
*** 51,77 ****
// load our language file
$user->add_lang('captcha_qa');
// read input
$this->confirm_id = request_var('qa_confirm_id', '');
$this->answer = request_var('qa_answer', '', true);
$this->type = (int) $type;
$this->question_lang = $user->data['user_lang'];
// we need all defined questions - shouldn't be too many, so we can just grab them
// try the user's lang first
! $sql = 'SELECT question_id FROM ' . CAPTCHA_QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($user->data['user_lang']) . '\'';
$result = $db->sql_query($sql, 3600);
while ($row = $db->sql_fetchrow($result))
{
$this->question_ids[$row['question_id']] = $row['question_id'];
}
$db->sql_freeresult($result);
// fallback to the board default lang
if (!sizeof($this->question_ids))
{
$this->question_lang = $config['default_lang'];
! $sql = 'SELECT question_id FROM ' . CAPTCHA_QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($config['default_lang']) . '\'';
$result = $db->sql_query($sql, 7200);
while ($row = $db->sql_fetchrow($result))
{
$this->question_ids[$row['question_id']] = $row['question_id'];
--- 50,86 ----
// load our language file
$user->add_lang('captcha_qa');
+
// read input
$this->confirm_id = request_var('qa_confirm_id', '');
$this->answer = request_var('qa_answer', '', true);
$this->type = (int) $type;
$this->question_lang = $user->data['user_lang'];
+
// we need all defined questions - shouldn't be too many, so we can just grab them
// try the user's lang first
! $sql = 'SELECT question_id
! FROM ' . CAPTCHA_QUESTIONS_TABLE . "
! WHERE lang_iso = '" . $db->sql_escape($user->data['user_lang']) . "'";
$result = $db->sql_query($sql, 3600);
+
while ($row = $db->sql_fetchrow($result))
{
$this->question_ids[$row['question_id']] = $row['question_id'];
}
$db->sql_freeresult($result);
+
// fallback to the board default lang
if (!sizeof($this->question_ids))
{
$this->question_lang = $config['default_lang'];
!
! $sql = 'SELECT question_id
! FROM ' . CAPTCHA_QUESTIONS_TABLE . "
! WHERE lang_iso = '" . $db->sql_escape($config['default_lang']) . "'";
$result = $db->sql_query($sql, 7200);
+
while ($row = $db->sql_fetchrow($result))
{
$this->question_ids[$row['question_id']] = $row['question_id'];
***************
*** 93,98 ****
--- 102,108 ----
function &get_instance()
{
$instance =& new phpbb_captcha_qa();
+
return $instance;
}
***************
*** 108,138 ****
include("$phpbb_root_path/includes/db/db_tools.$phpEx");
}
$db_tool = new phpbb_db_tools($db);
return $db_tool->sql_table_exists(CAPTCHA_QUESTIONS_TABLE);
}
!
/**
* API function - for the captcha to be available, it must have installed itself and there has to be at least one question in the board's default lang
*/
function is_available()
{
global $config, $db, $phpbb_root_path, $phpEx, $user;
!
// load language file for pretty display in the ACP dropdown
$user->add_lang('captcha_qa');
!
if (!phpbb_captcha_qa::is_installed())
{
return false;
}
! $sql = 'SELECT COUNT(question_id) as count FROM ' . CAPTCHA_QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($config['default_lang']) . '\'';
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
return ((bool) $row['count']);
}
-
/**
* API function
*/
--- 118,152 ----
include("$phpbb_root_path/includes/db/db_tools.$phpEx");
}
$db_tool = new phpbb_db_tools($db);
+
return $db_tool->sql_table_exists(CAPTCHA_QUESTIONS_TABLE);
}
!
/**
* API function - for the captcha to be available, it must have installed itself and there has to be at least one question in the board's default lang
*/
function is_available()
{
global $config, $db, $phpbb_root_path, $phpEx, $user;
!
// load language file for pretty display in the ACP dropdown
$user->add_lang('captcha_qa');
!
if (!phpbb_captcha_qa::is_installed())
{
return false;
}
!
! $sql = 'SELECT COUNT(question_id) as count
! FROM ' . CAPTCHA_QUESTIONS_TABLE . "
! WHERE lang_iso = '" . $db->sql_escape($config['default_lang']) . "'";
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
+
return ((bool) $row['count']);
}
/**
* API function
*/
***************
*** 141,147 ****
return true;
}
-
/**
* API function
*/
--- 155,160 ----
***************
*** 158,164 ****
return 'phpbb_captcha_qa';
}
-
/**
* API function - not needed as we don't display an image
*/
--- 171,176 ----
***************
*** 179,185 ****
function get_template()
{
global $template;
!
if ($this->is_solved())
{
return false;
--- 191,197 ----
function get_template()
{
global $template;
!
if ($this->is_solved())
{
return false;
***************
*** 218,223 ****
--- 230,236 ----
$hidden_fields['qa_answer'] = $this->answer;
}
$hidden_fields['qa_confirm_id'] = $this->confirm_id;
+
return $hidden_fields;
}
***************
*** 230,236 ****
$sql = 'SELECT DISTINCT c.session_id
FROM ' . CAPTCHA_QA_CONFIRM_TABLE . ' c
! LEFT JOIN ' . SESSIONS_TABLE . ' s ON (c.session_id = s.session_id)
WHERE s.session_id IS NULL' .
((empty($type)) ? '' : ' AND c.confirm_type = ' . (int) $type);
$result = $db->sql_query($sql);
--- 243,250 ----
$sql = 'SELECT DISTINCT c.session_id
FROM ' . CAPTCHA_QA_CONFIRM_TABLE . ' c
! LEFT JOIN ' . SESSIONS_TABLE . ' s
! ON (c.session_id = s.session_id)
WHERE s.session_id IS NULL' .
((empty($type)) ? '' : ' AND c.confirm_type = ' . (int) $type);
$result = $db->sql_query($sql);
***************
*** 238,243 ****
--- 252,258 ----
if ($row = $db->sql_fetchrow($result))
{
$sql_in = array();
+
do
{
$sql_in[] = (string) $row['session_id'];
***************
*** 274,281 ****
include("$phpbb_root_path/includes/db/db_tools.$phpEx");
}
$db_tool = new phpbb_db_tools($db);
$tables = array(CAPTCHA_QUESTIONS_TABLE, CAPTCHA_ANSWERS_TABLE, CAPTCHA_QA_CONFIRM_TABLE);
!
$schemas = array(
CAPTCHA_QUESTIONS_TABLE => array (
'COLUMNS' => array(
--- 289,297 ----
include("$phpbb_root_path/includes/db/db_tools.$phpEx");
}
$db_tool = new phpbb_db_tools($db);
+
$tables = array(CAPTCHA_QUESTIONS_TABLE, CAPTCHA_ANSWERS_TABLE, CAPTCHA_QA_CONFIRM_TABLE);
!
$schemas = array(
CAPTCHA_QUESTIONS_TABLE => array (
'COLUMNS' => array(
***************
*** 315,321 ****
'PRIMARY_KEY' => 'confirm_id',
),
);
!
foreach($schemas as $table => $schema)
{
if (!$db_tool->sql_table_exists($table))
--- 331,337 ----
'PRIMARY_KEY' => 'confirm_id',
),
);
!
foreach($schemas as $table => $schema)
{
if (!$db_tool->sql_table_exists($table))
***************
*** 325,339 ****
}
}
-
/**
* API function - see what has to be done to validate
*/
function validate()
{
global $config, $db, $user;
!
$error = '';
if (!$this->confirm_id)
{
$error = $user->lang['CONFIRM_QUESTION_WRONG'];
--- 341,355 ----
}
}
/**
* API function - see what has to be done to validate
*/
function validate()
{
global $config, $db, $user;
!
$error = '';
+
if (!$this->confirm_id)
{
$error = $user->lang['CONFIRM_QUESTION_WRONG'];
***************
*** 356,361 ****
--- 372,378 ----
// okay, incorrect answer. Let's ask a new question.
$this->new_attempt();
$this->solved = false;
+
return $error;
}
else
***************
*** 373,389 ****
$this->confirm_id = md5(unique_id($user->ip));
$this->question = (int) array_rand($this->question_ids);
!
$sql = 'INSERT INTO ' . CAPTCHA_QA_CONFIRM_TABLE . ' ' . $db->sql_build_array('INSERT', array(
! 'confirm_id' => (string) $this->confirm_id,
! 'session_id' => (string) $user->session_id,
! 'lang_iso' => (string) $this->question_lang,
! 'confirm_type' => (int) $this->type,
! 'question_id' => (int) $this->question,
));
$db->sql_query($sql);
- $this->load_answer();
}
/**
--- 390,406 ----
$this->confirm_id = md5(unique_id($user->ip));
$this->question = (int) array_rand($this->question_ids);
!
$sql = 'INSERT INTO ' . CAPTCHA_QA_CONFIRM_TABLE . ' ' . $db->sql_build_array('INSERT', array(
! 'confirm_id' => (string) $this->confirm_id,
! 'session_id' => (string) $user->session_id,
! 'lang_iso' => (string) $this->question_lang,
! 'confirm_type' => (int) $this->type,
! 'question_id' => (int) $this->question,
));
$db->sql_query($sql);
+ $this->load_answer();
}
/**
***************
*** 395,408 ****
$this->question = (int) array_rand($this->question_ids);
$this->solved = 0;
- // compute $seed % 0x7fffffff
! $sql = 'UPDATE ' . CAPTCHA_QA_CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
! 'question' => (int) $this->question,)) . '
! WHERE
! confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\'
! AND session_id = \'' . $db->sql_escape($user->session_id) . '\'';
$db->sql_query($sql);
$this->load_answer();
}
--- 412,424 ----
$this->question = (int) array_rand($this->question_ids);
$this->solved = 0;
! $sql = 'UPDATE ' . CAPTCHA_QA_CONFIRM_TABLE . '
! SET question_id = ' . (int) $this->question . "
! WHERE confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
! AND session_id = '" . $db->sql_escape($user->session_id) . "'";
$db->sql_query($sql);
+
$this->load_answer();
}
***************
*** 416,430 ****
// yah, I would prefer a stronger rand, but this should work
$this->question = (int) array_rand($this->question_ids);
$this->solved = 0;
- // compute $seed % 0x7fffffff
! $sql = 'UPDATE ' . CAPTCHA_QA_CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
! 'question_id' => (int) $this->question)) . ',
! attempts = attempts + 1
! WHERE
! confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\'
! AND session_id = \'' . $db->sql_escape($user->session_id) . '\'';
$db->sql_query($sql);
$this->load_answer();
}
--- 432,445 ----
// yah, I would prefer a stronger rand, but this should work
$this->question = (int) array_rand($this->question_ids);
$this->solved = 0;
! $sql = 'UPDATE ' . CAPTCHA_QA_CONFIRM_TABLE . '
! SET question_id = ' . (int) $this->question . ",
! attempts = attempts + 1
! WHERE confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
! AND session_id = '" . $db->sql_escape($user->session_id) . "'";
$db->sql_query($sql);
+
$this->load_answer();
}
***************
*** 434,440 ****
function load_answer()
{
global $db, $user;
!
$sql = 'SELECT con.question_id, attempts, question_text, strict
FROM ' . CAPTCHA_QA_CONFIRM_TABLE . ' con, ' . CAPTCHA_QUESTIONS_TABLE . " qes
WHERE con.question_id = qes.question_id
--- 449,455 ----
function load_answer()
{
global $db, $user;
!
$sql = 'SELECT con.question_id, attempts, question_text, strict
FROM ' . CAPTCHA_QA_CONFIRM_TABLE . ' con, ' . CAPTCHA_QUESTIONS_TABLE . " qes
WHERE con.question_id = qes.question_id
***************
*** 453,460 ****
--- 468,477 ----
$this->attempts = $row['attempts'];
$this->question_strict = $row['strict'];
$this->question_text = $row['question_text'];
+
return true;
}
+
return false;
}
***************
*** 464,486 ****
function check_answer()
{
global $db;
!
$answer = ($this->question_strict) ? request_var('qa_answer', '', true) : utf8_clean_string(request_var('qa_answer', '', true));
!
$sql = 'SELECT answer_text
! FROM ' . CAPTCHA_ANSWERS_TABLE . '
! WHERE question_id = ' . (int) $this->question;
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
! $solution = ($this->question_strict) ? $row['answer_text'] : utf8_clean_string($row['answer_text'] );
if ($solution === $answer)
{
$this->solved = true;
break;
}
}
$db->sql_freeresult($result);
return $this->solved;
}
--- 481,507 ----
function check_answer()
{
global $db;
!
$answer = ($this->question_strict) ? request_var('qa_answer', '', true) : utf8_clean_string(request_var('qa_answer', '', true));
!
$sql = 'SELECT answer_text
! FROM ' . CAPTCHA_ANSWERS_TABLE . '
! WHERE question_id = ' . (int) $this->question;
$result = $db->sql_query($sql);
+
while ($row = $db->sql_fetchrow($result))
{
! $solution = ($this->question_strict) ? $row['answer_text'] : utf8_clean_string($row['answer_text']);
!
if ($solution === $answer)
{
$this->solved = true;
+
break;
}
}
$db->sql_freeresult($result);
+
return $this->solved;
}
***************
*** 531,540 ****
{
$this->validate();
}
return (bool) $this->solved;
}
!
!
/**
* API function - The ACP backend, this marks the end of the easy methods
*/
--- 552,561 ----
{
$this->validate();
}
+
return (bool) $this->solved;
}
!
/**
* API function - The ACP backend, this marks the end of the easy methods
*/
***************
*** 550,555 ****
--- 571,577 ----
{
$this->install();
}
+
$module->tpl_name = 'captcha_qa_acp';
$module->page_title = 'ACP_VC_SETTINGS';
$form_key = 'acp_captcha';
***************
*** 558,571 ****
$submit = request_var('submit', false);
$question_id = request_var('question_id', 0);
$action = request_var('action', '');
!
// we have two pages, so users might want to navigate from one to the other
$list_url = $module->u_action . "&configure=1&select_captcha=" . $this->get_class_name();
!
$template->assign_vars(array(
! 'U_ACTION' => $module->u_action,
! 'QUESTION_ID' => $question_id ,
! 'CLASS' => $this->get_class_name(),
));
// show the list?
--- 580,593 ----
$submit = request_var('submit', false);
$question_id = request_var('question_id', 0);
$action = request_var('action', '');
!
// we have two pages, so users might want to navigate from one to the other
$list_url = $module->u_action . "&configure=1&select_captcha=" . $this->get_class_name();
!
$template->assign_vars(array(
! 'U_ACTION' => $module->u_action,
! 'QUESTION_ID' => $question_id ,
! 'CLASS' => $this->get_class_name(),
));
// show the list?
***************
*** 578,583 ****
--- 600,606 ----
if (confirm_box(true))
{
$this->acp_delete_question($question_id);
+
trigger_error($user->lang['QUESTION_DELETED'] . adm_back_link($list_url));
}
else
***************
*** 600,605 ****
--- 623,629 ----
$input_lang = request_var('lang_iso', '', true);
$input_strict = request_var('strict', false);
$langs = $this->get_languages();
+
foreach ($langs as $lang => $entry)
{
$template->assign_block_vars('langs', array(
***************
*** 607,621 ****
'NAME' => $entry['name'],
));
}
!
$template->assign_vars(array(
! 'U_LIST' => $list_url,
));
if ($question_id)
{
if ($question = $this->acp_get_question_data($question_id))
{
$answers = (isset($input_answers[$lang])) ? $input_answers[$lang] : implode("\n", $question['answers']);
$template->assign_vars(array(
'QUESTION_TEXT' => ($input_question) ? $input_question : $question['question_text'],
'LANG_ISO' => ($input_lang) ? $input_lang : $question['lang_iso'],
--- 631,647 ----
'NAME' => $entry['name'],
));
}
!
$template->assign_vars(array(
! 'U_LIST' => $list_url,
));
+
if ($question_id)
{
if ($question = $this->acp_get_question_data($question_id))
{
$answers = (isset($input_answers[$lang])) ? $input_answers[$lang] : implode("\n", $question['answers']);
+
$template->assign_vars(array(
'QUESTION_TEXT' => ($input_question) ? $input_question : $question['question_text'],
'LANG_ISO' => ($input_lang) ? $input_lang : $question['lang_iso'],
***************
*** 630,647 ****
}
else
{
-
$template->assign_vars(array(
! 'QUESTION_TEXT' => $input_question,
! 'LANG_ISO' => $input_lang,
! 'STRICT' => $input_strict,
! 'ANSWERS' => $input_answers,
));
}
!
if ($submit && check_form_key($form_key))
{
$data = $this->acp_get_question_input();
if (!$this->validate_input($data))
{
$template->assign_vars(array(
--- 656,673 ----
}
else
{
$template->assign_vars(array(
! 'QUESTION_TEXT' => $input_question,
! 'LANG_ISO' => $input_lang,
! 'STRICT' => $input_strict,
! 'ANSWERS' => $input_answers,
));
}
!
if ($submit && check_form_key($form_key))
{
$data = $this->acp_get_question_input();
+
if (!$this->validate_input($data))
{
$template->assign_vars(array(
***************
*** 658,664 ****
{
$this->acp_add_question($data);
}
!
trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($list_url));
}
}
--- 684,690 ----
{
$this->acp_add_question($data);
}
!
trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($list_url));
}
}
***************
*** 668,674 ****
}
}
}
-
/**
* This handles the list overview
--- 694,699 ----
***************
*** 676,682 ****
function acp_question_list(&$module)
{
global $db, $template;
!
$sql = 'SELECT *
FROM ' . CAPTCHA_QUESTIONS_TABLE;
$result = $db->sql_query($sql);
--- 701,707 ----
function acp_question_list(&$module)
{
global $db, $template;
!
$sql = 'SELECT *
FROM ' . CAPTCHA_QUESTIONS_TABLE;
$result = $db->sql_query($sql);
***************
*** 688,694 ****
while ($row = $db->sql_fetchrow($result))
{
$url = $module->u_action . "&question_id={$row['question_id']}&configure=1&select_captcha=" . $this->get_class_name() . '&';
!
$template->assign_block_vars('questions', array(
'QUESTION_TEXT' => $row['question_text'],
'QUESTION_ID' => $row['question_id'],
--- 713,719 ----
while ($row = $db->sql_fetchrow($result))
{
$url = $module->u_action . "&question_id={$row['question_id']}&configure=1&select_captcha=" . $this->get_class_name() . '&';
!
$template->assign_block_vars('questions', array(
'QUESTION_TEXT' => $row['question_text'],
'QUESTION_ID' => $row['question_id'],
***************
*** 737,744 ****
return $question;
}
}
!
!
/**
* Grab a question from input and bring it into a format the editor understands
*/
--- 762,768 ----
return $question;
}
}
!
/**
* Grab a question from input and bring it into a format the editor understands
*/
***************
*** 780,786 ****
$cache->destroy('sql', CAPTCHA_QUESTIONS_TABLE);
}
!
/**
* Insert a question.
* param mixed $data : an array as created from acp_get_question_input or acp_get_question_data
--- 804,810 ----
$cache->destroy('sql', CAPTCHA_QUESTIONS_TABLE);
}
!
/**
* Insert a question.
* param mixed $data : an array as created from acp_get_question_input or acp_get_question_data
***************
*** 795,801 ****
$question_ary['lang_id'] = $langs[$data['lang_iso']]['id'];
unset($question_ary['answers']);
! $sql = 'INSERT INTO ' . CAPTCHA_QUESTIONS_TABLE . $db->sql_build_array('INSERT', $question_ary);
$db->sql_query($sql);
$question_id = $db->sql_nextid();
--- 819,825 ----
$question_ary['lang_id'] = $langs[$data['lang_iso']]['id'];
unset($question_ary['answers']);
! $sql = 'INSERT INTO ' . CAPTCHA_QUESTIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $question_ary);
$db->sql_query($sql);
$question_id = $db->sql_nextid();
***************
*** 804,810 ****
$cache->destroy('sql', CAPTCHA_QUESTIONS_TABLE);
}
!
/**
* Insert the answers.
* param mixed $data : an array as created from acp_get_question_input or acp_get_question_data
--- 828,834 ----
$cache->destroy('sql', CAPTCHA_QUESTIONS_TABLE);
}
!
/**
* Insert the answers.
* param mixed $data : an array as created from acp_get_question_input or acp_get_question_data
***************
*** 812,818 ****
function acp_insert_answers($data, $question_id)
{
global $db, $cache;
!
foreach ($data['answers'] as $answer)
{
$answer_ary = array(
--- 836,842 ----
function acp_insert_answers($data, $question_id)
{
global $db, $cache;
!
foreach ($data['answers'] as $answer)
{
$answer_ary = array(
***************
*** 820,832 ****
'answer_text' => $answer,
);
! $sql = 'INSERT INTO ' . CAPTCHA_ANSWERS_TABLE . $db->sql_build_array('INSERT', $answer_ary);
$db->sql_query($sql);
}
$cache->destroy('sql', CAPTCHA_ANSWERS_TABLE);
}
-
/**
* Delete a question.
--- 844,855 ----
'answer_text' => $answer,
);
! $sql = 'INSERT INTO ' . CAPTCHA_ANSWERS_TABLE . ' ' . $db->sql_build_array('INSERT', $answer_ary);
$db->sql_query($sql);
}
$cache->destroy('sql', CAPTCHA_ANSWERS_TABLE);
}
/**
* Delete a question.
***************
*** 846,853 ****
$cache->destroy('sql', $tables);
}
!
!
/**
* Check if the entered data can be inserted/used
* param mixed $data : an array as created from acp_get_question_input or acp_get_question_data
--- 869,875 ----
$cache->destroy('sql', $tables);
}
!
/**
* Check if the entered data can be inserted/used
* param mixed $data : an array as created from acp_get_question_input or acp_get_question_data
***************
*** 873,879 ****
return true;
}
!
/**
* List the installed language packs
*/
--- 895,901 ----
return true;
}
!
/**
* List the installed language packs
*/
***************
*** 881,893 ****
{
global $db;
- $langs = array();
-
$sql = 'SELECT *
FROM ' . LANG_TABLE;
-
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
$langs[$row['lang_iso']] = array(
--- 903,913 ----
{
global $db;
$sql = 'SELECT *
FROM ' . LANG_TABLE;
$result = $db->sql_query($sql);
+ $langs = array();
while ($row = $db->sql_fetchrow($result))
{
$langs[$row['lang_iso']] = array(
***************
*** 899,905 ****
return $langs;
}
-
}
?>
\ No newline at end of file
--- 919,924 ----
|
|
From: Meik S. <acy...@ph...> - 2009-09-03 09:26:12
|
Author: acydburn
Date: Thu Sep 3 10:25:16 2009
New Revision: 10090
Log:
We only remove board cookies (this is what the feature is supposed to do). This also solves issues with headers having > 20 Set-Cookie calls (which in turn breaks varnish 2.0.4-rc1 too)
Modified:
branches/phpBB-3_0_0/phpBB/ucp.php
Modified: branches/phpBB-3_0_0/phpBB/ucp.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/ucp.php (original)
--- branches/phpBB-3_0_0/phpBB/ucp.php Thu Sep 3 10:25:16 2009
***************
*** 143,148 ****
--- 143,154 ----
foreach ($_COOKIE as $cookie_name => $cookie_data)
{
+ // Only delete board cookies, no other ones...
+ if (strpos($cookie_name, $config['cookie_name'] . '_') !== 0)
+ {
+ continue;
+ }
+
$cookie_name = str_replace($config['cookie_name'] . '_', '', $cookie_name);
// Polls are stored as {cookie_name}_poll_{topic_id}, cookie_name_ got removed, therefore checking for poll_
|
|
From: Jim W. <ter...@ph...> - 2009-09-02 05:21:47
|
Author: terrafrost
Date: Wed Sep 2 06:20:59 2009
New Revision: 10089
Log:
attributed the fix for bug 43045 to DavidIQ
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Wed Sep 2 06:20:59 2009
***************
*** 239,244 ****
--- 239,245 ----
<li>[Change] Simplified login_box() and redirection after login. S_LOGIN_ACTION can now be used on every page. (Bug #50285)</li>
<li>[Change] Do not take edit post time into account for determining permission to delete last post in topic. (Bug #48615)</li>
<li>[Change] Resize oversized Topic icons (Bug #44415)</li>
+ <li>[Change] Banned IPs are now sorted (Bug #43045 - Patch by DavidIQ)</li>
<li>[Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)</li>
<li>[Feature] Backported 3.2 captcha plugins.
<ul>
|
|
From: Jim W. <ter...@ph...> - 2009-09-02 05:13:08
|
Author: terrafrost
Date: Wed Sep 2 06:12:23 2009
New Revision: 10088
Log:
Fixed bugs #43145, #44375, #44415 and #43045
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/acp/acp_ban.php
branches/phpBB-3_0_0/phpBB/includes/acp/acp_icons.php
branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php
branches/phpBB-3_0_0/phpBB/includes/functions.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Wed Sep 2 06:12:23 2009
***************
*** 205,210 ****
--- 205,212 ----
<li>[Fix] Fix handling of bookmarks and subscriptions on "split topcis", "merge topics" and "merge posts". (Bug #50035)</li>
<li>[Fix] Only embed cron.php if there is no cron lock present to reduce overhead. (Bug #45725 - Patch by TerryE)</li>
<li>[Fix] Add header gradient back into subsilver2 but keep site logo easily replaceable with smaller and bigger ones. (Bug #11142 - Patch by dark/Rain and Raimon)</li>
+ <li>[Fix] Activation email not sent from user settings (Bug #43145)</li>
+ <li>[Fix] Resend activation e-mail link inappropriate if using Admin activation (Bug #44375 - Patch by bbrunnrman)</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>
***************
*** 231,241 ****
<li>[Change] Parse multiline url title for [url] BBCode tag. (Bug #1309)</li>
<li>[Change] Introduce new parameter to page_header() for forum specific who is online listings.</li>
<li>[Change] Lifted minimum requirement for Firebird DBMS from 2.0+ to 2.1+.</li>
! <li>[Change] Unapproved topics can no longer be replied to (Bug #44005)</li>
<li>[Change] Require user to be registered and logged in to search for unread posts if topic read tracking is disabled for guests (Bug #49525)</li>
<li>[Change] Allow three-digit hex notation in Color BBcode. (Bug #39965 - Patch by m0rpha)</li>
<li>[Change] Simplified login_box() and redirection after login. S_LOGIN_ACTION can now be used on every page. (Bug #50285)</li>
<li>[Change] Do not take edit post time into account for determining permission to delete last post in topic. (Bug #48615)</li>
<li>[Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)</li>
<li>[Feature] Backported 3.2 captcha plugins.
<ul>
--- 233,244 ----
<li>[Change] Parse multiline url title for [url] BBCode tag. (Bug #1309)</li>
<li>[Change] Introduce new parameter to page_header() for forum specific who is online listings.</li>
<li>[Change] Lifted minimum requirement for Firebird DBMS from 2.0+ to 2.1+.</li>
! <li>[Change] Unapproved topics can no longer be replied to (Bug #44005, #47675, #23605)</li>
<li>[Change] Require user to be registered and logged in to search for unread posts if topic read tracking is disabled for guests (Bug #49525)</li>
<li>[Change] Allow three-digit hex notation in Color BBcode. (Bug #39965 - Patch by m0rpha)</li>
<li>[Change] Simplified login_box() and redirection after login. S_LOGIN_ACTION can now be used on every page. (Bug #50285)</li>
<li>[Change] Do not take edit post time into account for determining permission to delete last post in topic. (Bug #48615)</li>
+ <li>[Change] Resize oversized Topic icons (Bug #44415)</li>
<li>[Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)</li>
<li>[Feature] Backported 3.2 captcha plugins.
<ul>
***************
*** 269,275 ****
<li>[Feature] Add option to disable remote upload avatars (Bug #45375 - Patch by nickvergessen)</li>
<li>[Feature] Ability to delete warnings and keep warnings permanently (Bug #43375 - Patch by nickvergessen)</li>
<li>[Feature] Ability to empty a user's outbox from the user ACP quick tools.</li>
! <li>[Feature] Ability to filter ACP / MCP logs</li>
<li>[Feature] Users can report PMs to moderators which are then visible in a new MCP module</li>
<li>[Feature] Parse email text files with the template engine.</li>
<li>[Feature] Use email-style quoting when bbcodes are disabled.</li>
--- 272,278 ----
<li>[Feature] Add option to disable remote upload avatars (Bug #45375 - Patch by nickvergessen)</li>
<li>[Feature] Ability to delete warnings and keep warnings permanently (Bug #43375 - Patch by nickvergessen)</li>
<li>[Feature] Ability to empty a user's outbox from the user ACP quick tools.</li>
! <li>[Feature] Ability to search ACP / MCP logs</li>
<li>[Feature] Users can report PMs to moderators which are then visible in a new MCP module</li>
<li>[Feature] Parse email text files with the template engine.</li>
<li>[Feature] Use email-style quoting when bbcodes are disabled.</li>
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_ban.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_ban.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_ban.php Wed Sep 2 06:12:23 2009
***************
*** 156,162 ****
FROM ' . BANLIST_TABLE . '
WHERE (ban_end >= ' . time() . "
OR ban_end = 0)
! AND ban_ip <> ''";
break;
case 'email':
--- 156,163 ----
FROM ' . BANLIST_TABLE . '
WHERE (ban_end >= ' . time() . "
OR ban_end = 0)
! AND ban_ip <> ''
! ORDER BY ban_ip";
break;
case 'email':
***************
*** 168,174 ****
FROM ' . BANLIST_TABLE . '
WHERE (ban_end >= ' . time() . "
OR ban_end = 0)
! AND ban_email <> ''";
break;
}
$result = $db->sql_query($sql);
--- 169,176 ----
FROM ' . BANLIST_TABLE . '
WHERE (ban_end >= ' . time() . "
OR ban_end = 0)
! AND ban_email <> ''
! ORDER BY ban_email";
break;
}
$result = $db->sql_query($sql);
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_icons.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_icons.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_icons.php Wed Sep 2 06:12:23 2009
***************
*** 89,94 ****
--- 89,106 ----
continue;
}
+ // adjust the width and height to be lower than 128px while perserving the aspect ratio
+ if ($img_size[0] > 127 && $img_size[0] > $img_size[1])
+ {
+ $img_size[1] = (int) ($img_size[1] * (127 / $img_size[0]));
+ $img_size[0] = 127;
+ }
+ else if ($img_size[1] > 127)
+ {
+ $img_size[0] = (int) ($img_size[0] * (127 / $img_size[1]));
+ $img_size[1] = 127;
+ }
+
$_images[$path . $img]['file'] = $path . $img;
$_images[$path . $img]['width'] = $img_size[0];
$_images[$path . $img]['height'] = $img_size[1];
***************
*** 388,393 ****
--- 400,416 ----
$image_height[$image] = $img_size[1];
}
+ if ($image_width[$image] > 127 && $image_width[$image] > $image_height[$image])
+ {
+ $image_height[$image] = (int) ($image_height[$image] * (127 / $image_width[$image]));
+ $image_width[$image] = 127;
+ }
+ else if ($image_height[$image] > 127)
+ {
+ $image_width[$image] = (int) ($image_width[$image] * (127 / $image_height[$image]));
+ $image_height[$image] = 127;
+ }
+
$img_sql = array(
$fields . '_url' => $image,
$fields . '_width' => $image_width[$image],
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php Wed Sep 2 06:12:23 2009
***************
*** 385,390 ****
--- 385,415 ----
user_active_flip('flip', $user_id);
+ if ($user_row['user_type'] == USER_INACTIVE)
+ {
+ if ($config['require_activation'] == USER_ACTIVATION_ADMIN)
+ {
+ include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
+
+ $messenger = new messenger(false);
+
+ $messenger->template('admin_welcome_activated', $user_row['user_lang']);
+
+ $messenger->to($user_row['user_email'], $user_row['username']);
+
+ $messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
+ $messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
+ $messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
+ $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+
+ $messenger->assign_vars(array(
+ 'USERNAME' => htmlspecialchars_decode($user_row['username']))
+ );
+
+ $messenger->send(NOTIFY_EMAIL);
+ }
+ }
+
$message = ($user_row['user_type'] == USER_INACTIVE) ? 'USER_ADMIN_ACTIVATED' : 'USER_ADMIN_DEACTIVED';
$log = ($user_row['user_type'] == USER_INACTIVE) ? 'LOG_USER_ACTIVE' : 'LOG_USER_INACTIVE';
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 Sep 2 06:12:23 2009
***************
*** 3006,3012 ****
'LOGIN_EXPLAIN' => $l_explain,
'U_SEND_PASSWORD' => ($config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') : '',
! 'U_RESEND_ACTIVATION' => ($config['require_activation'] != USER_ACTIVATION_NONE && $config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=resend_act') : '',
'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'),
'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'),
--- 3006,3012 ----
'LOGIN_EXPLAIN' => $l_explain,
'U_SEND_PASSWORD' => ($config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') : '',
! 'U_RESEND_ACTIVATION' => ($config['require_activation'] == USER_ACTIVATION_SELF && $config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=resend_act') : '',
'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'),
'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'),
|
|
From: Andreas F. <ba...@ph...> - 2009-09-01 18:38:31
|
Author: bantu
Date: Tue Sep 1 19:37:51 2009
New Revision: 10087
Log:
Save some calls here, since page_footer(true) gets called quite often.
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 Sep 1 19:37:51 2009
***************
*** 4288,4293 ****
--- 4288,4294 ----
if (!defined('IN_CRON') && $run_cron && !$config['board_disable'])
{
$call_cron = true;
+ $time_now = (!empty($user->time_now) && is_int($user->time_now)) ? $user->time_now : time();
// Any old lock present?
if (!empty($config['cron_lock']))
***************
*** 4295,4301 ****
$cron_time = explode(' ', $config['cron_lock']);
// If 1 hour lock is present we do not call cron.php
! if ($cron_time[0] + 3600 >= time())
{
$call_cron = false;
}
--- 4296,4302 ----
$cron_time = explode(' ', $config['cron_lock']);
// If 1 hour lock is present we do not call cron.php
! if ($cron_time[0] + 3600 >= $time_now)
{
$call_cron = false;
}
***************
*** 4307,4337 ****
{
$cron_type = '';
! if (time() - $config['queue_interval'] > $config['last_queue_run'] && !defined('IN_ADMIN') && file_exists($phpbb_root_path . 'cache/queue.' . $phpEx))
{
// Process email queue
$cron_type = 'queue';
}
! else if (method_exists($cache, 'tidy') && time() - $config['cache_gc'] > $config['cache_last_gc'])
{
// Tidy the cache
$cron_type = 'tidy_cache';
}
! else if ($config['warnings_expire_days'] && (time() - $config['warnings_gc'] > $config['warnings_last_gc']))
{
$cron_type = 'tidy_warnings';
}
! else if (time() - $config['database_gc'] > $config['database_last_gc'])
{
// Tidy the database
$cron_type = 'tidy_database';
}
! else if (time() - $config['search_gc'] > $config['search_last_gc'])
{
// Tidy the search
$cron_type = 'tidy_search';
}
! else if (time() - $config['session_gc'] > $config['session_last_gc'])
{
$cron_type = 'tidy_sessions';
}
--- 4308,4338 ----
{
$cron_type = '';
! if ($time_now - $config['queue_interval'] > $config['last_queue_run'] && !defined('IN_ADMIN') && file_exists($phpbb_root_path . 'cache/queue.' . $phpEx))
{
// Process email queue
$cron_type = 'queue';
}
! else if (method_exists($cache, 'tidy') && $time_now - $config['cache_gc'] > $config['cache_last_gc'])
{
// Tidy the cache
$cron_type = 'tidy_cache';
}
! else if ($config['warnings_expire_days'] && ($time_now - $config['warnings_gc'] > $config['warnings_last_gc']))
{
$cron_type = 'tidy_warnings';
}
! else if ($time_now - $config['database_gc'] > $config['database_last_gc'])
{
// Tidy the database
$cron_type = 'tidy_database';
}
! else if ($time_now - $config['search_gc'] > $config['search_last_gc'])
{
// Tidy the search
$cron_type = 'tidy_search';
}
! else if ($time_now - $config['session_gc'] > $config['session_last_gc'])
{
$cron_type = 'tidy_sessions';
}
|
|
From: Andreas F. <ba...@ph...> - 2009-09-01 18:28:33
|
Author: bantu
Date: Tue Sep 1 19:27:49 2009
New Revision: 10086
Log:
Add header gradient back into subsilver2 but keep site logo easily replaceable with smaller and bigger ones.
Bug #11142, related to r7567. Thanks to dark/Rain and Raimon.
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/imageset/site_logo.gif
branches/phpBB-3_0_0/phpBB/styles/subsilver2/theme/images/background.gif
branches/phpBB-3_0_0/phpBB/styles/subsilver2/theme/stylesheet.css
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Tue Sep 1 19:27:49 2009
***************
*** 204,209 ****
--- 204,210 ----
<li>[Fix] Correctly display list items in forum description in prosilver and administration. (Bug #48055 - Patch by leviatan21)</li>
<li>[Fix] Fix handling of bookmarks and subscriptions on "split topcis", "merge topics" and "merge posts". (Bug #50035)</li>
<li>[Fix] Only embed cron.php if there is no cron lock present to reduce overhead. (Bug #45725 - Patch by TerryE)</li>
+ <li>[Fix] Add header gradient back into subsilver2 but keep site logo easily replaceable with smaller and bigger ones. (Bug #11142 - Patch by dark/Rain and Raimon)</li>
<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/imageset/site_logo.gif
==============================================================================
Binary files - no diff available.
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/theme/images/background.gif
==============================================================================
Binary files - no diff available.
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/theme/stylesheet.css
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/theme/stylesheet.css (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/theme/stylesheet.css Tue Sep 1 19:27:49 2009
***************
*** 34,45 ****
}
#wrapheader {
- min-height: 120px;
height: auto !important;
- height: 120px;
- /* background-image: url('./images/background.gif');
- background-repeat: repeat-x;*/
- /* padding: 0 25px 15px 25px;*/
padding: 0;
}
--- 34,40 ----
***************
*** 62,71 ****
}
#logodesc {
! margin-bottom: 5px;
! padding: 5px 25px;
! background: #D9DFE4;
! border-bottom: 1px solid #4787A7;
}
#menubar {
--- 57,67 ----
}
#logodesc {
! background-color: #C1CAD2;
! background-image: url('./images/background.gif');
! background-repeat: repeat-x;
! background-position: center bottom;
! padding: 0 25px 15px 25px;
}
#menubar {
|
|
From: Meik S. <acy...@ph...> - 2009-09-01 15:08:26
|
Author: acydburn
Date: Tue Sep 1 16:08:04 2009
New Revision: 10085
Log:
Correctly assign board administrator email for L_CONFIRM_EXPLAIN in captcha plugins.
Modified:
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php Tue Sep 1 16:08:04 2009
***************
*** 88,94 ****
function get_template()
{
global $config, $user, $template, $phpEx, $phpbb_root_path;
!
if ($this->is_solved())
{
return false;
--- 88,94 ----
function get_template()
{
global $config, $user, $template, $phpEx, $phpbb_root_path;
!
if ($this->is_solved())
{
return false;
***************
*** 96,103 ****
else
{
$link = append_sid($phpbb_root_path . 'ucp.' . $phpEx, 'mode=confirm&confirm_id=' . $this->confirm_id . '&type=' . $this->type);
! $explain = ($this->type != CONFIRM_POST) ? sprintf($user->lang['CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>') : $user->lang['POST_CONFIRM_EXPLAIN'];
!
$template->assign_vars(array(
'CONFIRM_IMAGE_LINK' => $link,
'CONFIRM_IMAGE' => '<img src="' . $link . '" />',
--- 96,103 ----
else
{
$link = append_sid($phpbb_root_path . 'ucp.' . $phpEx, 'mode=confirm&confirm_id=' . $this->confirm_id . '&type=' . $this->type);
! $explain = $user->lang(($this->type != CONFIRM_POST) ? 'CONFIRM_EXPLAIN' : 'POST_CONFIRM_EXPLAIN', '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>');
!
$template->assign_vars(array(
'CONFIRM_IMAGE_LINK' => $link,
'CONFIRM_IMAGE' => '<img src="' . $link . '" />',
***************
*** 118,124 ****
global $config, $user, $template, $phpbb_admin_path, $phpEx;
$variables = '';
!
if (is_array($this->captcha_vars))
{
foreach ($this->captcha_vars as $captcha_var => $template_var)
--- 118,124 ----
global $config, $user, $template, $phpbb_admin_path, $phpEx;
$variables = '';
!
if (is_array($this->captcha_vars))
{
foreach ($this->captcha_vars as $captcha_var => $template_var)
***************
*** 192,198 ****
function validate()
{
global $config, $db, $user;
!
$error = '';
if (!$this->confirm_id)
{
--- 192,198 ----
function validate()
{
global $config, $db, $user;
!
$error = '';
if (!$this->confirm_id)
{
***************
*** 264,270 ****
'code' => (string) $this->code,
'seed' => (int) $this->seed)) . '
WHERE
! confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\'
AND session_id = \'' . $db->sql_escape($user->session_id) . '\'';
$db->sql_query($sql);
}
--- 264,270 ----
'code' => (string) $this->code,
'seed' => (int) $this->seed)) . '
WHERE
! confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\'
AND session_id = \'' . $db->sql_escape($user->session_id) . '\'';
$db->sql_query($sql);
}
***************
*** 285,297 ****
$sql = 'UPDATE ' . CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
'code' => (string) $this->code,
'seed' => (int) $this->seed)) . '
! , attempts = attempts + 1
WHERE
! confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\'
AND session_id = \'' . $db->sql_escape($user->session_id) . '\'';
$db->sql_query($sql);
}
!
/**
* Look up everything we need for painting&checking.
*/
--- 285,297 ----
$sql = 'UPDATE ' . CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
'code' => (string) $this->code,
'seed' => (int) $this->seed)) . '
! , attempts = attempts + 1
WHERE
! confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\'
AND session_id = \'' . $db->sql_escape($user->session_id) . '\'';
$db->sql_query($sql);
}
!
/**
* Look up everything we need for painting&checking.
*/
***************
*** 352,358 ****
// we leave the class usable by generating a new question
$this->generate_code();
}
!
function is_solved()
{
if (request_var('confirm_code', false) && $this->solved === 0)
--- 352,358 ----
// we leave the class usable by generating a new question
$this->generate_code();
}
!
function is_solved()
{
if (request_var('confirm_code', false) && $this->solved === 0)
***************
*** 361,367 ****
}
return (bool) $this->solved;
}
!
/**
* API function
*/
--- 361,367 ----
}
return (bool) $this->solved;
}
!
/**
* API function
*/
***************
*** 369,375 ****
{
return false;
}
!
}
?>
\ No newline at end of file
--- 369,375 ----
{
return false;
}
!
}
?>
\ No newline at end of file
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 Tue Sep 1 16:08:04 2009
***************
*** 54,60 ****
$user->add_lang('captcha_recaptcha');
return (isset($config['recaptcha_pubkey']) && !empty($config['recaptcha_pubkey']));
}
!
/**
* API function
*/
--- 54,60 ----
$user->add_lang('captcha_recaptcha');
return (isset($config['recaptcha_pubkey']) && !empty($config['recaptcha_pubkey']));
}
!
/**
* API function
*/
***************
*** 143,148 ****
--- 143,150 ----
}
else
{
+ $explain = $user->lang(($this->type != CONFIRM_POST) ? 'CONFIRM_EXPLAIN' : 'POST_CONFIRM_EXPLAIN', '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>');
+
$template->assign_vars(array(
'RECAPTCHA_SERVER' => $this->recaptcha_server,
'RECAPTCHA_PUBKEY' => isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '',
***************
*** 150,155 ****
--- 152,158 ----
'S_RECAPTCHA_AVAILABLE' => $this->is_available(),
'S_CONFIRM_CODE' => true,
'S_TYPE' => $this->type,
+ 'L_CONFIRM_EXPLAIN' => $explain,
));
return 'captcha_recaptcha.html';
|
|
From: Meik S. <acy...@ph...> - 2009-09-01 15:08:10
|
Author: acydburn
Date: Tue Sep 1 16:07:26 2009
New Revision: 10084
Log:
erm, wrong position
Modified:
branches/phpBB-3_0_0/phpBB/install/database_update.php
Modified: branches/phpBB-3_0_0/phpBB/install/database_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/database_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/database_update.php Tue Sep 1 16:07:26 2009
***************
*** 694,699 ****
--- 694,701 ----
$_module->move_module_by($module_row, 'move_up', $steps);
}
}
+
+ $_module->remove_cache_file();
}
/****************************************************************************
***************
*** 1304,1311 ****
_add_modules($modules_to_install);
- $_module->remove_cache_file();
-
// Add newly_registered group... but check if it already exists (we always supported running the updater on any schema)
$sql = 'SELECT group_id
FROM ' . GROUPS_TABLE . "
--- 1306,1311 ----
|
|
From: Meik S. <acy...@ph...> - 2009-09-01 12:38:35
|
Author: acydburn
Date: Tue Sep 1 13:32:16 2009
New Revision: 10083
Log:
Fix IE6 display for very large forum icons - Bug #44695 - Patch by Ishimaru Chiaki
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/tweaks.css
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/tweaks.css
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/tweaks.css (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/tweaks.css Tue Sep 1 13:32:16 2009
***************
*** 67,72 ****
--- 67,77 ----
height: 35px;
}
+ * html li.row dl.icon dt {
+ height: 35px;
+ overflow: visible;
+ }
+
* html #search-box {
width: 25%;
}
|
|
From: Meik S. <acy...@ph...> - 2009-09-01 11:40:46
|
Author: acydburn
Date: Tue Sep 1 12:39:59 2009
New Revision: 10082
Log:
Only embed cron.php if there is no cron lock present to reduce overhead. (Bug #45725 - Patch by TerryE)
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/functions.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Tue Sep 1 12:39:59 2009
***************
*** 203,208 ****
--- 203,209 ----
<li>[Fix] Only show "Add friend" and "Add foe" links if the specific module is enabled. (Bug #50475)</li>
<li>[Fix] Correctly display list items in forum description in prosilver and administration. (Bug #48055 - Patch by leviatan21)</li>
<li>[Fix] Fix handling of bookmarks and subscriptions on "split topcis", "merge topics" and "merge posts". (Bug #50035)</li>
+ <li>[Fix] Only embed cron.php if there is no cron lock present to reduce overhead. (Bug #45725 - Patch by TerryE)</li>
<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Tue Sep 1 12:39:59 2009
***************
*** 4284,4291 ****
--- 4284,4310 ----
);
// Call cron-type script
+ $call_cron = false;
if (!defined('IN_CRON') && $run_cron && !$config['board_disable'])
{
+ $call_cron = true;
+
+ // Any old lock present?
+ if (!empty($config['cron_lock']))
+ {
+ $cron_time = explode(' ', $config['cron_lock']);
+
+ // If 1 hour lock is present we do not call cron.php
+ if ($cron_time[0] + 3600 >= time())
+ {
+ $call_cron = false;
+ }
+ }
+ }
+
+ // Call cron job?
+ if ($call_cron)
+ {
$cron_type = '';
if (time() - $config['queue_interval'] > $config['last_queue_run'] && !defined('IN_ADMIN') && file_exists($phpbb_root_path . 'cache/queue.' . $phpEx))
|
|
From: Meik S. <acy...@ph...> - 2009-09-01 11:22:27
|
Author: acydburn
Date: Tue Sep 1 12:21:42 2009
New Revision: 10081
Log:
adjust inactive users list on ACP index to act like the new inactive users list from r9845
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html
branches/phpBB-3_0_0/phpBB/includes/acp/acp_main.php
Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html Tue Sep 1 12:21:42 2009
***************
*** 214,232 ****
<th>{L_USERNAME}</th>
<th>{L_JOINED}</th>
<th>{L_INACTIVE_DATE}</th>
- <th>{L_INACTIVE_REASON}</th>
<th>{L_LAST_VISIT}</th>
</tr>
</thead>
<tbody>
<!-- BEGIN inactive -->
<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
! <td><a href="{inactive.U_USER_ADMIN}">{inactive.USERNAME}</a></td>
! <td>{inactive.JOINED}</td>
! <td>{inactive.INACTIVE_DATE}</td>
! <td>{inactive.REASON}</td>
! <td>{inactive.LAST_VISIT}</td>
</tr>
<!-- BEGINELSE -->
<tr>
--- 214,237 ----
<th>{L_USERNAME}</th>
<th>{L_JOINED}</th>
<th>{L_INACTIVE_DATE}</th>
<th>{L_LAST_VISIT}</th>
+ <th>{L_INACTIVE_REASON}</th>
</tr>
</thead>
<tbody>
<!-- BEGIN inactive -->
<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
! <td style="vertical-align: top;">
! {inactive.USERNAME_FULL}
! <!-- IF inactive.POSTS --><br />{L_POSTS}: <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
! </td>
! <td style="vertical-align: top;">{inactive.JOINED}</td>
! <td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td>
! <td style="vertical-align: top;">{inactive.LAST_VISIT}</td>
! <td style="vertical-align: top;">
! {inactive.REASON}
! <!-- IF inactive.REMINDED --><br />{inactive.REMINDED_EXPLAIN}<!-- ENDIF -->
</tr>
<!-- BEGINELSE -->
<tr>
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_main.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_main.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_main.php Tue Sep 1 12:21:42 2009
***************
*** 540,545 ****
--- 540,547 ----
if ($auth->acl_get('a_user'))
{
+ $user->add_lang('memberlist');
+
$inactive = array();
$inactive_count = 0;
***************
*** 549,561 ****
{
$template->assign_block_vars('inactive', array(
'INACTIVE_DATE' => $user->format_date($row['user_inactive_time']),
'JOINED' => $user->format_date($row['user_regdate']),
'LAST_VISIT' => (!$row['user_lastvisit']) ? ' - ' : $user->format_date($row['user_lastvisit']),
'REASON' => $row['inactive_reason'],
'USER_ID' => $row['user_id'],
! 'USERNAME' => $row['username'],
! 'U_USER_ADMIN' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=users&mode=overview&u={$row['user_id']}"))
! );
}
$option_ary = array('activate' => 'ACTIVATE', 'delete' => 'DELETE');
--- 551,574 ----
{
$template->assign_block_vars('inactive', array(
'INACTIVE_DATE' => $user->format_date($row['user_inactive_time']),
+ 'REMINDED_DATE' => $user->format_date($row['user_reminded_time']),
'JOINED' => $user->format_date($row['user_regdate']),
'LAST_VISIT' => (!$row['user_lastvisit']) ? ' - ' : $user->format_date($row['user_lastvisit']),
+
'REASON' => $row['inactive_reason'],
'USER_ID' => $row['user_id'],
! 'POSTS' => ($row['user_posts']) ? $row['user_posts'] : 0,
! 'REMINDED' => $row['user_reminded'],
!
! 'REMINDED_EXPLAIN' => $user->lang('USER_LAST_REMINDED', (int) $row['user_reminded'], $user->format_date($row['user_reminded_time'])),
!
! 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'], false, append_sid("{$phpbb_admin_path}index.$phpEx", 'i=users&mode=overview')),
! 'USERNAME' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']),
! 'USER_COLOR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']),
!
! 'U_USER_ADMIN' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=users&mode=overview&u={$row['user_id']}"),
! 'U_SEARCH_USER' => ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id={$row['user_id']}&sr=posts") : '',
! ));
}
$option_ary = array('activate' => 'ACTIVATE', 'delete' => 'DELETE');
|
Author: nickvergessen
Date: Mon Aug 31 15:57:04 2009
New Revision: 10080
Log:
fix r10076 for #48615 - Ability to specify amount of time user is able to delete his last post in topic.
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php
branches/phpBB-3_0_0/phpBB/install/database_update.php
branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql
branches/phpBB-3_0_0/phpBB/language/en/acp/board.php
branches/phpBB-3_0_0/phpBB/posting.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 Mon Aug 31 15:57:04 2009
***************
*** 201,207 ****
<li>[Fix] Sort private messages by message time and not message id. (Bug #50015)</li>
<li>[Fix] Make sure only logs for existing users are displayed and user-specific logs removed on user deletion. (Bug #49855)</li>
<li>[Fix] Only show "Add friend" and "Add foe" links if the specific module is enabled. (Bug #50475)</li>
- <li>[Fix] Do not take edit post time into account for determining permission to delete last post in topic. (Bug #48615)</li>
<li>[Fix] Correctly display list items in forum description in prosilver and administration. (Bug #48055 - Patch by leviatan21)</li>
<li>[Fix] Fix handling of bookmarks and subscriptions on "split topcis", "merge topics" and "merge posts". (Bug #50035)</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>
--- 201,206 ----
***************
*** 234,239 ****
--- 233,239 ----
<li>[Change] Require user to be registered and logged in to search for unread posts if topic read tracking is disabled for guests (Bug #49525)</li>
<li>[Change] Allow three-digit hex notation in Color BBcode. (Bug #39965 - Patch by m0rpha)</li>
<li>[Change] Simplified login_box() and redirection after login. S_LOGIN_ACTION can now be used on every page. (Bug #50285)</li>
+ <li>[Change] Do not take edit post time into account for determining permission to delete last post in topic. (Bug #48615)</li>
<li>[Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)</li>
<li>[Feature] Backported 3.2 captcha plugins.
<ul>
***************
*** 289,294 ****
--- 289,295 ----
<li>[Feature] Ability to define constant PHPBB_USE_BOARD_URL_PATH to use board url for images/avatars/ranks/imageset...</li>
<li>[Feature] Added function to generate Email hash. (Bug #49195)</li>
<li>[Feature] Style authors are now able to define the default submit button used for form submission on ENTER keypress on forms using more than one. Prosilver uses this for the posting page(s) and registration screen.</li>
+ <li>[Feature] Ability to specify amount of time user is able to delete his last post in topic.</li>
</ul>
<a name="v304"></a><h3>1.ii. Changes since 3.0.4</h3>
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_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 31 15:57:04 2009
***************
*** 177,182 ****
--- 177,183 ----
'legend2' => 'POSTING',
'bump_type' => false,
'edit_time' => array('lang' => 'EDIT_TIME', 'validate' => 'int:0', 'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
+ 'delete_time' => array('lang' => 'DELETE_TIME', 'validate' => 'int:0', 'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
'display_last_edited' => array('lang' => 'DISPLAY_LAST_EDITED', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'flood_interval' => array('lang' => 'FLOOD_INTERVAL', 'validate' => 'int:0', 'type' => 'text:3:10', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
'bump_interval' => array('lang' => 'BUMP_INTERVAL', 'validate' => 'int:0', 'type' => 'custom', 'method' => 'bump_interval', 'explain' => true),
Modified: branches/phpBB-3_0_0/phpBB/install/database_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/database_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/database_update.php Mon Aug 31 15:57:04 2009
***************
*** 1498,1503 ****
--- 1498,1508 ----
_sql($sql, $errored, $error_ary);
}
+ if (!isset($config['delete_time']))
+ {
+ set_config('delete_time', $config['edit_time']);
+ }
+
$no_updates = false;
break;
}
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql Mon Aug 31 15:57:04 2009
***************
*** 90,95 ****
--- 90,96 ----
INSERT INTO phpbb_config (config_name, config_value) VALUES ('display_last_edited', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('display_order', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('edit_time', '0');
+ INSERT INTO phpbb_config (config_name, config_value) VALUES ('delete_time', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_check_mx', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_enable', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_function_name', 'mail');
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/board.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/board.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/board.php Mon Aug 31 15:57:04 2009
***************
*** 152,157 ****
--- 152,159 ----
'BUMP_INTERVAL_EXPLAIN' => 'Number of minutes, hours or days between the last post to a topic and the ability to bump this topic.',
'CHAR_LIMIT' => 'Maximum characters per post/message',
'CHAR_LIMIT_EXPLAIN' => 'The number of characters allowed within a post/private message. Set to 0 for unlimited characters.',
+ 'DELETE_TIME' => 'Limit deleting time',
+ 'DELETE_TIME_EXPLAIN' => 'Limits the time available to delete a new post. Setting the value to 0 disables this behaviour.',
'DISPLAY_LAST_EDITED' => 'Display last edited time information',
'DISPLAY_LAST_EDITED_EXPLAIN' => 'Choose if the last edited by information to be displayed on posts.',
'EDIT_TIME' => 'Limit editing time',
Modified: branches/phpBB-3_0_0/phpBB/posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/posting.php (original)
--- branches/phpBB-3_0_0/phpBB/posting.php Mon Aug 31 15:57:04 2009
***************
*** 1433,1439 ****
'S_EDIT_REASON' => ($mode == 'edit' && $auth->acl_get('m_edit', $forum_id)) ? true : false,
'S_DISPLAY_USERNAME' => (!$user->data['is_registered'] || ($mode == 'edit' && $post_data['poster_id'] == ANONYMOUS)) ? true : false,
'S_SHOW_TOPIC_ICONS' => $s_topic_icons,
! 'S_DELETE_ALLOWED' => ($mode == 'edit' && (($post_id == $post_data['topic_last_post_id'] && $post_data['poster_id'] == $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id) && !$post_data['post_edit_locked']) || $auth->acl_get('m_delete', $forum_id))) ? true : false,
'S_BBCODE_ALLOWED' => $bbcode_status,
'S_BBCODE_CHECKED' => ($bbcode_checked) ? ' checked="checked"' : '',
'S_SMILIES_ALLOWED' => $smilies_status,
--- 1433,1439 ----
'S_EDIT_REASON' => ($mode == 'edit' && $auth->acl_get('m_edit', $forum_id)) ? true : false,
'S_DISPLAY_USERNAME' => (!$user->data['is_registered'] || ($mode == 'edit' && $post_data['poster_id'] == ANONYMOUS)) ? true : false,
'S_SHOW_TOPIC_ICONS' => $s_topic_icons,
! 'S_DELETE_ALLOWED' => ($mode == 'edit' && (($post_id == $post_data['topic_last_post_id'] && $post_data['poster_id'] == $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id) && !$post_data['post_edit_locked'] && ($post_data['post_time'] > time() - ($config['delete_time'] * 60) || !$config['delete_time'])) || $auth->acl_get('m_delete', $forum_id))) ? true : false,
'S_BBCODE_ALLOWED' => $bbcode_status,
'S_BBCODE_CHECKED' => ($bbcode_checked) ? ' checked="checked"' : '',
'S_SMILIES_ALLOWED' => $smilies_status,
***************
*** 1545,1551 ****
global $phpbb_root_path, $phpEx;
// If moderator removing post or user itself removing post, present a confirmation screen
! if ($auth->acl_get('m_delete', $forum_id) || ($post_data['poster_id'] == $user->data['user_id'] && $user->data['is_registered'] && $auth->acl_get('f_delete', $forum_id) && $post_id == $post_data['topic_last_post_id'] && !$post_data['post_edit_locked']))
{
$s_hidden_fields = build_hidden_fields(array(
'p' => $post_id,
--- 1545,1551 ----
global $phpbb_root_path, $phpEx;
// If moderator removing post or user itself removing post, present a confirmation screen
! if ($auth->acl_get('m_delete', $forum_id) || ($post_data['poster_id'] == $user->data['user_id'] && $user->data['is_registered'] && $auth->acl_get('f_delete', $forum_id) && $post_id == $post_data['topic_last_post_id'] && !$post_data['post_edit_locked'] && ($post_data['post_time'] > time() - ($config['delete_time'] * 60) || !$config['delete_time'])))
{
$s_hidden_fields = build_hidden_fields(array(
'p' => $post_id,
Modified: branches/phpBB-3_0_0/phpBB/viewtopic.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/viewtopic.php (original)
--- branches/phpBB-3_0_0/phpBB/viewtopic.php Mon Aug 31 15:57:04 2009
***************
*** 1476,1482 ****
$user->data['user_id'] == $poster_id &&
$auth->acl_get('f_delete', $forum_id) &&
$topic_data['topic_last_post_id'] == $row['post_id'] &&
! // we do not want to allowe removal of the last post if a moderator locked it!
!$row['post_edit_locked']
)));
--- 1476,1483 ----
$user->data['user_id'] == $poster_id &&
$auth->acl_get('f_delete', $forum_id) &&
$topic_data['topic_last_post_id'] == $row['post_id'] &&
! ($row['post_time'] > time() - ($config['delete_time'] * 60) || !$config['delete_time']) &&
! // we do not want to allow removal of the last post if a moderator locked it!
!$row['post_edit_locked']
)));
|
|
From: Joas S. <nic...@ph...> - 2009-08-31 13:58:29
|
Author: nickvergessen
Date: Mon Aug 31 14:50:40 2009
New Revision: 10079
Log:
Fix Bug #50035 - Fix handling of bookmarks and subscriptions on "split topcis", "merge topics" and "merge posts"
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_forum.php
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_topic.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 31 14:50:40 2009
***************
*** 203,208 ****
--- 203,209 ----
<li>[Fix] Only show "Add friend" and "Add foe" links if the specific module is enabled. (Bug #50475)</li>
<li>[Fix] Do not take edit post time into account for determining permission to delete last post in topic. (Bug #48615)</li>
<li>[Fix] Correctly display list items in forum description in prosilver and administration. (Bug #48055 - Patch by leviatan21)</li>
+ <li>[Fix] Fix handling of bookmarks and subscriptions on "split topcis", "merge topics" and "merge posts". (Bug #50035)</li>
<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_forum.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_forum.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_forum.php Mon Aug 31 14:50:40 2009
***************
*** 416,426 ****
--- 416,429 ----
// If the topic no longer exist, we will update the topic watch table.
// To not let it error out on users watching both topics, we just return on an error...
+ // Same for Bookmarks
$db->sql_return_on_error(true);
$db->sql_query('UPDATE ' . TOPICS_WATCH_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids));
+ $db->sql_query('UPDATE ' . BOOKMARKS_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids));
$db->sql_return_on_error(false);
$db->sql_query('DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids));
+ $db->sql_query('DELETE FROM ' . BOOKMARKS_TABLE . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids));
// Link to the new topic
$return_link .= (($return_link) ? '<br /><br />' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&t=' . $to_topic_id) . '">', '</a>');
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_topic.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_topic.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_topic.php Mon Aug 31 14:50:40 2009
***************
*** 503,508 ****
--- 503,547 ----
// Update forum statistics
set_config_count('num_topics', 1, true);
+ // Add new topic to bookmarks
+ $bookmarks = array();
+ $sql = 'SELECT user_id
+ FROM ' . BOOKMARKS_TABLE . '
+ WHERE topic_id = ' . $topic_id;
+ $result = $db->sql_query($sql);
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $bookmarks[] = array(
+ 'user_id' => (int) $row['user_id'],
+ 'topic_id' => $to_topic_id,
+ );
+ }
+ $db->sql_freeresult($result);
+ if (sizeof($bookmarks))
+ {
+ $db->sql_multi_insert(BOOKMARKS_TABLE, $bookmarks);
+ }
+
+ // Add new topic to watch-list
+ $notifications = array();
+ $sql = 'SELECT user_id, notify_status
+ FROM ' . TOPICS_WATCH_TABLE . '
+ WHERE topic_id = ' . $topic_id;
+ $result = $db->sql_query($sql);
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $notifications[] = array(
+ 'user_id' => (int) $row['user_id'],
+ 'topic_id' => $to_topic_id,
+ 'notify_status' => (int) $row['notify_status'],
+ );
+ }
+ $db->sql_freeresult($result);
+ if (sizeof($notifications))
+ {
+ $db->sql_multi_insert(TOPICS_WATCH_TABLE, $notifications);
+ }
+
// Link back to both topics
$return_link = sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&t=' . $post_info['topic_id']) . '">', '</a>') . '<br /><br />' . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&t=' . $to_topic_id) . '">', '</a>');
}
***************
*** 596,612 ****
--- 635,699 ----
if ($row)
{
+ // Add new topic to bookmarks
+ $bookmarks = array();
+ $sql = 'SELECT user_id
+ FROM ' . BOOKMARKS_TABLE . '
+ WHERE topic_id = ' . (int) $topic_id;
+ $result = $db->sql_query($sql);
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $bookmarks[] = array(
+ 'user_id' => (int) $row['user_id'],
+ 'topic_id' => (int) $to_topic_id,
+ );
+ }
+ $db->sql_freeresult($result);
+ if (sizeof($bookmarks))
+ {
+ // To not let it error out on users, who already bookmarked the topic, we just return on an error...
+ $db->sql_return_on_error(true);
+ $db->sql_multi_insert(BOOKMARKS_TABLE, $bookmarks);
+ $db->sql_return_on_error(false);
+ }
+
+ // Add new topic to notifications
+ $notifications = array();
+ $sql = 'SELECT user_id, notify_status
+ FROM ' . TOPICS_WATCH_TABLE . '
+ WHERE topic_id = ' . (int) $topic_id;
+ $result = $db->sql_query($sql);
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $notifications[] = array(
+ 'user_id' => (int) $row['user_id'],
+ 'topic_id' => (int) $to_topic_id,
+ 'notify_status' => (int) $row['notify_status'],
+ );
+ }
+ $db->sql_freeresult($result);
+ if (sizeof($notifications))
+ {
+ // To not let it error out on users, who already watch the topic, we just return on an error...
+ $db->sql_return_on_error(true);
+ $db->sql_multi_insert(TOPICS_WATCH_TABLE, $notifications);
+ $db->sql_return_on_error(false);
+ }
+
$return_link .= sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . '&t=' . $topic_id) . '">', '</a>');
}
else
{
// If the topic no longer exist, we will update the topic watch table.
// To not let it error out on users watching both topics, we just return on an error...
+ // Same for bookmarks
$db->sql_return_on_error(true);
$db->sql_query('UPDATE ' . TOPICS_WATCH_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE topic_id = ' . (int) $topic_id);
+ $db->sql_query('UPDATE ' . BOOKMARKS_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE topic_id = ' . (int) $topic_id);
$db->sql_return_on_error(false);
$db->sql_query('DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE topic_id = ' . (int) $topic_id);
+ $db->sql_query('DELETE FROM ' . BOOKMARKS_TABLE . ' WHERE topic_id = ' . (int) $topic_id);
}
// Link to the new topic
|
|
From: Meik S. <acy...@ph...> - 2009-08-31 13:16:30
|
Author: acydburn
Date: Mon Aug 31 14:16:10 2009
New Revision: 10078
Log:
set to !important because lists with the applied display: list-item will result in forum descriptions shown even if hidden (at least in safari)
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewforum_body.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewtopic_body.html
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewforum_body.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewforum_body.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewforum_body.html Mon Aug 31 14:16:10 2009
***************
*** 5,11 ****
<!-- IF FORUM_DESC or MODERATORS or U_MCP -->
<p>
<!-- NOTE: remove the style="display: none" when you want to have the forum description on the forum body -->
! <!-- IF FORUM_DESC --><span style="display: none">{FORUM_DESC}<br /></span><!-- ENDIF -->
<!-- IF MODERATORS --><strong><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->:</strong> {MODERATORS}<!-- ENDIF -->
</p>
<!-- ENDIF -->
--- 5,11 ----
<!-- IF FORUM_DESC or MODERATORS or U_MCP -->
<p>
<!-- NOTE: remove the style="display: none" when you want to have the forum description on the forum body -->
! <!-- IF FORUM_DESC --><div style="display: none !important;">{FORUM_DESC}<br /></div><!-- ENDIF -->
<!-- IF MODERATORS --><strong><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->:</strong> {MODERATORS}<!-- ENDIF -->
</p>
<!-- ENDIF -->
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewtopic_body.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewtopic_body.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/viewtopic_body.html Mon Aug 31 14:16:10 2009
***************
*** 2,8 ****
<!-- IF U_MCP --><p>[ <a href="{U_MCP}">{L_MCP}</a> ]</p><!-- ENDIF -->
<h2><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>
<!-- NOTE: remove the style="display: none" when you want to have the forum description on the topic body -->
! <!-- IF FORUM_DESC --><span style="display: none">{FORUM_DESC}<br /></span><!-- ENDIF -->
<!-- IF MODERATORS or U_MCP -->
<p>
--- 2,8 ----
<!-- IF U_MCP --><p>[ <a href="{U_MCP}">{L_MCP}</a> ]</p><!-- ENDIF -->
<h2><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>
<!-- NOTE: remove the style="display: none" when you want to have the forum description on the topic body -->
! <!-- IF FORUM_DESC --><div style="display: none !important;">{FORUM_DESC}<br /></div><!-- ENDIF -->
<!-- IF MODERATORS or U_MCP -->
<p>
|
|
From: Meik S. <acy...@ph...> - 2009-08-31 12:45:23
|
Author: acydburn
Date: Mon Aug 31 13:45:02 2009
New Revision: 10077
Log:
Correctly display list items in forum description in prosilver and administration. (Bug #48055 - Patch by leviatan21)
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/admin.css
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/content.css
Modified: branches/phpBB-3_0_0/phpBB/adm/style/admin.css
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/admin.css (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/admin.css Mon Aug 31 13:45:02 2009
***************
*** 121,126 ****
--- 121,137 ----
font-weight: bold;
}
+ /* List items */
+ ul, ol {
+ list-style-position: inside;
+ margin-left: 1em;
+ }
+
+ li {
+ display: list-item;
+ list-style-type: inherit;
+ }
+
/* Main blocks
---------------------------------------- */
#wrap {
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 31 13:45:02 2009
***************
*** 202,207 ****
--- 202,208 ----
<li>[Fix] Make sure only logs for existing users are displayed and user-specific logs removed on user deletion. (Bug #49855)</li>
<li>[Fix] Only show "Add friend" and "Add foe" links if the specific module is enabled. (Bug #50475)</li>
<li>[Fix] Do not take edit post time into account for determining permission to delete last post in topic. (Bug #48615)</li>
+ <li>[Fix] Correctly display list items in forum description in prosilver and administration. (Bug #48055 - Patch by leviatan21)</li>
<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/content.css
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/content.css (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/content.css Mon Aug 31 13:45:02 2009
***************
*** 132,137 ****
--- 132,149 ----
font-size: 1.2em;
}
+ /* List in forum description */
+ dl.icon dt ol,
+ dl.icon dt ul {
+ list-style-position: inside;
+ margin-left: 1em;
+ }
+
+ dl.icon dt li {
+ display: list-item;
+ list-style-type: inherit;
+ }
+
dd.lastpost {
width: 25%;
font-size: 1.1em;
|
|
From: Meik S. <acy...@ph...> - 2009-08-31 12:31:18
|
Author: acydburn
Date: Mon Aug 31 13:29:45 2009
New Revision: 10076
Log:
Do not take edit post time into account for determining permission to delete last post in topic. (Bug #48615)
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/posting.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 Mon Aug 31 13:29:45 2009
***************
*** 201,206 ****
--- 201,207 ----
<li>[Fix] Sort private messages by message time and not message id. (Bug #50015)</li>
<li>[Fix] Make sure only logs for existing users are displayed and user-specific logs removed on user deletion. (Bug #49855)</li>
<li>[Fix] Only show "Add friend" and "Add foe" links if the specific module is enabled. (Bug #50475)</li>
+ <li>[Fix] Do not take edit post time into account for determining permission to delete last post in topic. (Bug #48615)</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/posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/posting.php (original)
--- branches/phpBB-3_0_0/phpBB/posting.php Mon Aug 31 13:29:45 2009
***************
*** 1433,1439 ****
'S_EDIT_REASON' => ($mode == 'edit' && $auth->acl_get('m_edit', $forum_id)) ? true : false,
'S_DISPLAY_USERNAME' => (!$user->data['is_registered'] || ($mode == 'edit' && $post_data['poster_id'] == ANONYMOUS)) ? true : false,
'S_SHOW_TOPIC_ICONS' => $s_topic_icons,
! 'S_DELETE_ALLOWED' => ($mode == 'edit' && (($post_id == $post_data['topic_last_post_id'] && $post_data['poster_id'] == $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id) && !$post_data['post_edit_locked'] && ($post_data['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time'])) || $auth->acl_get('m_delete', $forum_id))) ? true : false,
'S_BBCODE_ALLOWED' => $bbcode_status,
'S_BBCODE_CHECKED' => ($bbcode_checked) ? ' checked="checked"' : '',
'S_SMILIES_ALLOWED' => $smilies_status,
--- 1433,1439 ----
'S_EDIT_REASON' => ($mode == 'edit' && $auth->acl_get('m_edit', $forum_id)) ? true : false,
'S_DISPLAY_USERNAME' => (!$user->data['is_registered'] || ($mode == 'edit' && $post_data['poster_id'] == ANONYMOUS)) ? true : false,
'S_SHOW_TOPIC_ICONS' => $s_topic_icons,
! 'S_DELETE_ALLOWED' => ($mode == 'edit' && (($post_id == $post_data['topic_last_post_id'] && $post_data['poster_id'] == $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id) && !$post_data['post_edit_locked']) || $auth->acl_get('m_delete', $forum_id))) ? true : false,
'S_BBCODE_ALLOWED' => $bbcode_status,
'S_BBCODE_CHECKED' => ($bbcode_checked) ? ' checked="checked"' : '',
'S_SMILIES_ALLOWED' => $smilies_status,
***************
*** 1545,1551 ****
global $phpbb_root_path, $phpEx;
// If moderator removing post or user itself removing post, present a confirmation screen
! if ($auth->acl_get('m_delete', $forum_id) || ($post_data['poster_id'] == $user->data['user_id'] && $user->data['is_registered'] && $auth->acl_get('f_delete', $forum_id) && $post_id == $post_data['topic_last_post_id'] && !$post_data['post_edit_locked'] && ($post_data['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time'])))
{
$s_hidden_fields = build_hidden_fields(array(
'p' => $post_id,
--- 1545,1551 ----
global $phpbb_root_path, $phpEx;
// If moderator removing post or user itself removing post, present a confirmation screen
! if ($auth->acl_get('m_delete', $forum_id) || ($post_data['poster_id'] == $user->data['user_id'] && $user->data['is_registered'] && $auth->acl_get('f_delete', $forum_id) && $post_id == $post_data['topic_last_post_id'] && !$post_data['post_edit_locked']))
{
$s_hidden_fields = build_hidden_fields(array(
'p' => $post_id,
Modified: branches/phpBB-3_0_0/phpBB/viewtopic.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/viewtopic.php (original)
--- branches/phpBB-3_0_0/phpBB/viewtopic.php Mon Aug 31 13:29:45 2009
***************
*** 1465,1470 ****
--- 1465,1484 ----
$s_first_unread = $first_unread = true;
}
+ $edit_allowed = ($user->data['is_registered'] && ($auth->acl_get('m_edit', $forum_id) || (
+ $user->data['user_id'] == $poster_id &&
+ $auth->acl_get('f_edit', $forum_id) &&
+ !$row['post_edit_locked'] &&
+ ($row['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time'])
+ )));
+
+ $delete_allowed = ($user->data['is_registered'] && ($auth->acl_get('m_delete', $forum_id) || (
+ $user->data['user_id'] == $poster_id &&
+ $auth->acl_get('f_delete', $forum_id) &&
+ $topic_data['topic_last_post_id'] == $row['post_id'] &&
+ // we do not want to allowe removal of the last post if a moderator locked it!
+ !$row['post_edit_locked']
+ )));
//
$postrow = array(
***************
*** 1499,1508 ****
'ONLINE_IMG' => ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? '' : (($user_cache[$poster_id]['online']) ? $user->img('icon_user_online', 'ONLINE') : $user->img('icon_user_offline', 'OFFLINE')),
'S_ONLINE' => ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? false : (($user_cache[$poster_id]['online']) ? true : false),
! 'U_EDIT' => (!$user->data['is_registered']) ? '' : ((($user->data['user_id'] == $poster_id && $auth->acl_get('f_edit', $forum_id) && ($row['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time'])) || $auth->acl_get('m_edit', $forum_id)) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&f=$forum_id&p={$row['post_id']}") : ''),
'U_QUOTE' => ($auth->acl_get('f_reply', $forum_id)) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=quote&f=$forum_id&p={$row['post_id']}") : '',
'U_INFO' => ($auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=post_details&f=$forum_id&p=" . $row['post_id'], true, $user->session_id) : '',
! 'U_DELETE' => (!$user->data['is_registered']) ? '' : ((($user->data['user_id'] == $poster_id && $auth->acl_get('f_delete', $forum_id) && $topic_data['topic_last_post_id'] == $row['post_id'] && !$row['post_edit_locked'] && ($row['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time'])) || $auth->acl_get('m_delete', $forum_id)) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=delete&f=$forum_id&p={$row['post_id']}") : ''),
'U_PROFILE' => $user_cache[$poster_id]['profile'],
'U_SEARCH' => $user_cache[$poster_id]['search'],
--- 1513,1522 ----
'ONLINE_IMG' => ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? '' : (($user_cache[$poster_id]['online']) ? $user->img('icon_user_online', 'ONLINE') : $user->img('icon_user_offline', 'OFFLINE')),
'S_ONLINE' => ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? false : (($user_cache[$poster_id]['online']) ? true : false),
! 'U_EDIT' => ($edit_allowed) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&f=$forum_id&p={$row['post_id']}") : '',
'U_QUOTE' => ($auth->acl_get('f_reply', $forum_id)) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=quote&f=$forum_id&p={$row['post_id']}") : '',
'U_INFO' => ($auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=post_details&f=$forum_id&p=" . $row['post_id'], true, $user->session_id) : '',
! 'U_DELETE' => ($delete_allowed) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=delete&f=$forum_id&p={$row['post_id']}") : '',
'U_PROFILE' => $user_cache[$poster_id]['profile'],
'U_SEARCH' => $user_cache[$poster_id]['search'],
|
|
From: Meik S. <acy...@ph...> - 2009-08-31 12:07:37
|
Author: acydburn
Date: Mon Aug 31 13:07:18 2009
New Revision: 10075
Log:
correct method comment
Modified:
branches/phpBB-3_0_0/phpBB/includes/search/fulltext_mysql.php
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 Mon Aug 31 13:07:18 2009
***************
*** 508,517 ****
/**
* Performs a search on an author's posts without caring about message contents. Depends on display specific params
*
! * @param array &$id_ary passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
! * @param int $start indicates the first index of the page
! * @param int $per_page number of ids each page is supposed to contain
! * @return total number of results
*/
function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
{
--- 508,530 ----
/**
* Performs a search on an author's posts without caring about message contents. Depends on display specific params
*
! * @param string $type contains either posts or topics depending on what should be searched for
! * @param boolean $firstpost_only if true, only topic starting posts will be considered
! * @param array $sort_by_sql contains SQL code for the ORDER BY part of a query
! * @param string $sort_key is the key of $sort_by_sql for the selected sorting
! * @param string $sort_dir is either a or d representing ASC and DESC
! * @param string $sort_days specifies the maximum amount of days a post may be old
! * @param array $ex_fid_ary specifies an array of forum ids which should not be searched
! * @param array $m_approve_fid_ary specifies an array of forum ids in which the searcher is allowed to view unapproved posts
! * @param int $topic_id is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
! * @param array $author_ary an array of author ids
! * @param string $author_name specifies the author match, when ANONYMOUS is also a search-match
! * @param array &$id_ary passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
! * @param int $start indicates the first index of the page
! * @param int $per_page number of ids each page is supposed to contain
! * @return boolean|int total number of results
! *
! * @access public
*/
function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
{
|
|
From: Meik S. <acy...@ph...> - 2009-08-31 11:25:43
|
Author: acydburn
Date: Mon Aug 31 12:25:28 2009
New Revision: 10074
Log:
Fix wrong error message for non-writable template file in acp_styles.php - Bug #50045
Modified:
branches/phpBB-3_0_0/phpBB/includes/acp/acp_styles.php
branches/phpBB-3_0_0/phpBB/language/en/acp/styles.php
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_styles.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_styles.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_styles.php Mon Aug 31 12:25:28 2009
***************
*** 747,753 ****
{
if (!($fp = @fopen($file, 'wb')))
{
! trigger_error($user->lang['NO_TEMPLATE'] . adm_back_link($this->u_action), E_USER_WARNING);
}
fwrite($fp, $template_data);
fclose($fp);
--- 747,754 ----
{
if (!($fp = @fopen($file, 'wb')))
{
! // File exists and is writeable, but still not able to be written to
! trigger_error(sprintf($user->lang['TEMPLATE_FILE_NOT_WRITABLE'], htmlspecialchars($template_file)) . adm_back_link($this->u_action), E_USER_WARNING);
}
fwrite($fp, $template_data);
fclose($fp);
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/styles.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/styles.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/styles.php Mon Aug 31 12:25:28 2009
***************
*** 392,397 ****
--- 392,398 ----
'TEMPLATE_LOCATION' => 'Store templates in',
'TEMPLATE_LOCATION_EXPLAIN' => 'Images are always stored on the filesystem.',
'TEMPLATE_NAME' => 'Template name',
+ 'TEMPLATE_FILE_NOT_WRITABLE'=> 'Unable to write to template file %s. Please check the permissions for the directory and the files.',
'TEMPLATE_REFRESHED' => 'Template refreshed successfully.',
'THEME_ADDED' => 'New theme added on filesystem.',
|
|
From: Meik S. <acy...@ph...> - 2009-08-31 11:18:47
|
Author: acydburn
Date: Mon Aug 31 12:18:06 2009
New Revision: 10073
Log:
Redirect to group list if confirm box canceled - Bug #50105
Modified:
branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_groups.php
Modified: branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_groups.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_groups.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_groups.php Mon Aug 31 12:18:06 2009
***************
*** 966,971 ****
--- 966,974 ----
);
}
+ // redirect to last screen
+ redirect($this->u_action . '&action=list&g=' . $group_id);
+
break;
case 'deleteusers':
***************
*** 1012,1017 ****
--- 1015,1023 ----
);
}
+ // redirect to last screen
+ redirect($this->u_action . '&action=list&g=' . $group_id);
+
break;
case 'addusers':
|
7 messages has been excluded from this view by a project administrator.
