Menu
▾
▴
phpbb-checkins — If you subscribed to this list, please update: code.phpbb.com
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(193) |
Nov
(393) |
Dec
(347) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(401) |
Feb
(232) |
Mar
(343) |
Apr
(129) |
May
(129) |
Jun
(116) |
Jul
(189) |
Aug
(129) |
Sep
(68) |
Oct
(172) |
Nov
(298) |
Dec
(148) |
| 2003 |
Jan
(264) |
Feb
(210) |
Mar
(322) |
Apr
(309) |
May
(234) |
Jun
(188) |
Jul
(215) |
Aug
(161) |
Sep
(234) |
Oct
(163) |
Nov
(110) |
Dec
(7) |
| 2004 |
Jan
(95) |
Feb
(107) |
Mar
(55) |
Apr
(3) |
May
(49) |
Jun
(35) |
Jul
(57) |
Aug
(43) |
Sep
(56) |
Oct
(40) |
Nov
(25) |
Dec
(21) |
| 2005 |
Jan
(93) |
Feb
(25) |
Mar
(22) |
Apr
(72) |
May
(45) |
Jun
(24) |
Jul
(29) |
Aug
(20) |
Sep
(50) |
Oct
(93) |
Nov
(69) |
Dec
(183) |
| 2006 |
Jan
(185) |
Feb
(143) |
Mar
(402) |
Apr
(260) |
May
(322) |
Jun
(367) |
Jul
(234) |
Aug
(299) |
Sep
(206) |
Oct
(288) |
Nov
(338) |
Dec
(307) |
| 2007 |
Jan
(296) |
Feb
(250) |
Mar
(261) |
Apr
(434) |
May
(539) |
Jun
(274) |
Jul
(440) |
Aug
(190) |
Sep
(128) |
Oct
(249) |
Nov
(86) |
Dec
(51) |
| 2008 |
Jan
(177) |
Feb
(67) |
Mar
(61) |
Apr
(48) |
May
(56) |
Jun
(97) |
Jul
(60) |
Aug
(64) |
Sep
(151) |
Oct
(79) |
Nov
(109) |
Dec
(123) |
| 2009 |
Jan
(70) |
Feb
(70) |
Mar
(73) |
Apr
(80) |
May
(22) |
Jun
(193) |
Jul
(191) |
Aug
(181) |
Sep
(120) |
Oct
(48) |
Nov
(24) |
Dec
|
|
From: Henry S. <kel...@ph...> - 2009-07-31 13:12:32
|
Author: Kellanved
Date: Fri Jul 31 14:11:44 2009
New Revision: 9897
Log:
Well
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 Fri Jul 31 14:11:44 2009
***************
*** 204,209 ****
--- 204,210 ----
<li>[Change] Add pagination for icons and smilies in the ACP and smilies in the smiley popup</li>
<li>[Change] Cache get_username_string() function calls on viewtopic.</li>
<li>[Change] Cache version check.</li>
+ <li>[Change] When creating a new forum without copying permissions, ask again. </li>
<li>[Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)</li>
<li>[Feature] Backported 3.2 captcha plugins.
<ul>
|
|
From: Henry S. <kel...@ph...> - 2009-07-31 12:47:30
|
Author: Kellanved
Date: Fri Jul 31 13:46:15 2009
New Revision: 9896
Log:
Add box if users decided not to select a forum to copy permissions from on forum creation
Added:
branches/phpBB-3_0_0/phpBB/adm/style/acp_forums_copy_perm.html (with props)
Modified:
branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php
branches/phpBB-3_0_0/phpBB/language/en/acp/forums.php
Added: branches/phpBB-3_0_0/phpBB/adm/style/acp_forums_copy_perm.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_forums_copy_perm.html (added)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_forums_copy_perm.html Fri Jul 31 13:46:15 2009
***************
*** 0 ****
--- 1,21 ----
+ <!-- INCLUDE overall_header.html -->
+
+ <form id="confirm" method="post" action="{S_COPY_ACTION}">
+
+ <fieldset>
+ <h1>{L_COPY_PERMISSIONS}</h1>
+ <p>{L_COPY_PERMISSIONS_EXPLAIN}</p>
+ <p>{L_ACL_LINK}</p>
+ <dl>
+ <dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
+ <dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>
+ </dl>
+ <div style="text-align: center;">{S_FORM_TOKEN}{S_HIDDEN_FIELDS}
+ <input type="submit" name="update" value="{L_CONTINUE}" class="button2" />
+ </div>
+
+ </fieldset>
+
+ </form>
+
+ <!-- INCLUDE overall_footer.html -->
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/acp_forums_copy_perm.html
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/acp_forums_copy_perm.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php Fri Jul 31 13:46:15 2009
***************
*** 74,79 ****
--- 74,86 ----
{
trigger_error($user->lang['NO_PERMISSION_FORUM_ADD'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING);
}
+
+ case 'copy_perm':
+
+ if (!(($auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth'))))
+ {
+ trigger_error($user->lang['NO_PERMISSION_COPY'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING);
+ }
break;
}
***************
*** 190,195 ****
--- 197,208 ----
copy_forum_permissions($forum_perm_from, $forum_data['forum_id'], ($action == 'edit') ? true : false);
cache_moderators();
}
+ else if (($action != 'edit') && $auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth'))
+ {
+ $this->copy_permission_page($forum_data);
+ return;
+ }
+
$auth->acl_clear_prefetch();
$cache->destroy('sql', FORUMS_TABLE);
***************
*** 687,692 ****
--- 700,735 ----
return;
break;
+
+ case 'copy_perm':
+ $forum_perm_from = request_var('forum_perm_from', 0);
+
+ // Copy permissions?
+ if (!empty($forum_perm_from) && $forum_perm_from != $forum_id)
+ {
+ copy_forum_permissions($forum_perm_from, $forum_id, true);
+ cache_moderators();
+ $auth->acl_clear_prefetch();
+ $cache->destroy('sql', FORUMS_TABLE);
+
+ $acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_id;
+
+ $message = $user->lang['FORUM_UPDATED'];
+
+ // Redirect to permissions
+ if ($auth->acl_get('a_fauth'))
+ {
+ $message .= '<br /><br />' . sprintf($user->lang['REDIRECT_ACL'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url) . '">', '</a>');
+ }
+
+ // redirect directly to permission settings screen if authed
+ if ($action == 'add' && !$forum_perm_from && $auth->acl_get('a_fauth'))
+ {
+ meta_refresh(4, append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url));
+ }
+
+ trigger_error($message . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id));
+ }
}
// Default management page
***************
*** 1876,1881 ****
--- 1919,1948 ----
adm_page_footer();
}
+
+ function copy_permission_page($forum_data)
+ {
+ global $phpEx, $phpbb_admin_path, $template, $user;
+
+ $acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_data['forum_id'];
+ $action = append_sid($this->u_action . "&parent_id={$this->parent_id}&f={$forum_data['forum_id']}&action=copy_perm");
+
+
+ $l_acl = sprintf($user->lang['COPY_TO_ACL'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url) . '">', '</a>');
+
+
+
+ $this->tpl_name = 'acp_forums_copy_perm';
+
+ $template->assign_vars(array(
+ 'U_ACL' => append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url),
+ 'L_ACL_LINK' => $l_acl,
+ 'L_BACK_LINK' => adm_back_link($this->u_action . '&parent_id=' . $this->parent_id),
+ 'S_COPY_ACTION' => $action,
+ 'S_FORUM_OPTIONS' => make_forum_select($forum_data['parent_id'], false, false, false, false),
+ ));
+ }
+
}
?>
\ No newline at end of file
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/forums.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/forums.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/forums.php Fri Jul 31 13:46:15 2009
***************
*** 44,52 ****
--- 44,55 ----
'AUTO_PRUNE_VIEWED' => 'Auto-prune post viewed age',
'AUTO_PRUNE_VIEWED_EXPLAIN' => 'Number of days since topic was viewed after which topic is removed.',
+ 'CONTINUE' => 'Continue',
'COPY_PERMISSIONS' => 'Copy permissions from',
+ 'COPY_PERMISSIONS_EXPLAIN' => 'To ease up the permission setup for your new forum, you can copy the permissions of an existing forum.',
'COPY_PERMISSIONS_ADD_EXPLAIN' => 'Once created, the forum will have the same permissions as the one you select here. If no forum is selected the newly created forum will not be visible until permissions had been set.',
'COPY_PERMISSIONS_EDIT_EXPLAIN' => 'If you select to copy permissions, the forum will have the same permissions as the one you select here. This will overwrite any permissions you have previously set for this forum with the permissions of the forum you select here. If no forum is selected the current permissions will be kept.',
+ 'COPY_TO_ACL' => 'Alternatively, you are also able to %sset up new permissions%s for this forum.',
'CREATE_FORUM' => 'Create new forum',
'DECIDE_MOVE_DELETE_CONTENT' => 'Delete content or move to forum',
|
|
From: Meik S. <acy...@ph...> - 2009-07-31 08:17:22
|
Author: acydburn
Date: Fri Jul 31 09:16:36 2009
New Revision: 9895
Log:
Revert r9878 - QR was already disabled by default, for admin convenience we enable the global setting but no local setting, which results in OFF by default
Modified:
branches/phpBB-3_0_0/phpBB/install/database_update.php
branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql
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 Fri Jul 31 09:16:36 2009
***************
*** 1452,1458 ****
if (!isset($config['allow_quick_reply']))
{
! set_config('allow_quick_reply', '0');
}
// Set every members user_options column to enable
--- 1452,1458 ----
if (!isset($config['allow_quick_reply']))
{
! set_config('allow_quick_reply', '1');
}
// Set every members user_options column to enable
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 Fri Jul 31 09:16:36 2009
***************
*** 27,33 ****
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_post_flash', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_post_links', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_privmsg', '1');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_quick_reply', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_bbcode', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_flash', '0');
--- 27,33 ----
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_post_flash', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_post_links', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_privmsg', '1');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_quick_reply', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_bbcode', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_flash', '0');
|
|
From: Meik S. <acy...@ph...> - 2009-07-30 14:36:22
|
Author: acydburn
Date: Thu Jul 30 15:35:29 2009
New Revision: 9894
Log:
Fix Bug #48875 - we compare the bitlength, therefore we indeed do not need to re-cache if we think acl options got changed (which we did)
Modified:
branches/phpBB-3_0_0/phpBB/includes/auth.php
Modified: branches/phpBB-3_0_0/phpBB/includes/auth.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/auth.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/auth.php Thu Jul 30 15:35:29 2009
***************
*** 64,72 ****
$db->sql_freeresult($result);
$cache->put('_acl_options', $this->acl_options);
- $this->acl_cache($userdata);
}
! else if (!trim($userdata['user_permissions']))
{
$this->acl_cache($userdata);
}
--- 64,72 ----
$db->sql_freeresult($result);
$cache->put('_acl_options', $this->acl_options);
}
!
! if (!trim($userdata['user_permissions']))
{
$this->acl_cache($userdata);
}
|
|
From: Joas S. <nic...@ph...> - 2009-07-30 13:50:23
|
Author: nickvergessen
Date: Thu Jul 30 14:39:38 2009
New Revision: 9892
Log:
Fix Bug #47295 - Min/max characters per posts also affects polls option
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/message_parser.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Thu Jul 30 14:39:38 2009
***************
*** 181,186 ****
--- 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>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
<li>[Change] Template engine now permits to a limited extent variable includes.</li>
Modified: branches/phpBB-3_0_0/phpBB/includes/message_parser.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/message_parser.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/message_parser.php Thu Jul 30 14:39:38 2009
***************
*** 1062,1071 ****
{
global $config, $db, $user;
- $mode = ($mode != 'post') ? 'sig' : 'post';
-
$this->mode = $mode;
$this->allow_img_bbcode = $allow_img_bbcode;
$this->allow_flash_bbcode = $allow_flash_bbcode;
$this->allow_quote_bbcode = $allow_quote_bbcode;
--- 1062,1082 ----
{
global $config, $db, $user;
$this->mode = $mode;
+ if (!isset($config['max_' . $mode . '_chars']))
+ {
+ $config['max_' . $mode . '_chars'] = 0;
+ }
+ if (!isset($config['max_' . $mode . '_smilies']))
+ {
+ $config['max_' . $mode . '_smilies'] = 0;
+ }
+ if (!isset($config['max_' . $mode . '_urls']))
+ {
+ $config['max_' . $mode . '_urls'] = 0;
+ }
+
$this->allow_img_bbcode = $allow_img_bbcode;
$this->allow_flash_bbcode = $allow_flash_bbcode;
$this->allow_quote_bbcode = $allow_quote_bbcode;
***************
*** 1100,1106 ****
}
// Minimum message length check for post only
! if ($mode !== 'sig')
{
if (!$message_length || $message_length < (int) $config['min_post_chars'])
{
--- 1111,1117 ----
}
// Minimum message length check for post only
! if ($mode === 'post')
{
if (!$message_length || $message_length < (int) $config['min_post_chars'])
{
***************
*** 1153,1159 ****
// Check for "empty" message. We do not check here for maximum length, because bbcode, smilies, etc. can add to the length.
// The maximum length check happened before any parsings.
! if ($mode !== 'sig' && utf8_clean_string($this->message) === '')
{
$this->warn_msg[] = $user->lang['TOO_FEW_CHARS'];
return (!$update_this_message) ? $return_message : $this->warn_msg;
--- 1164,1170 ----
// Check for "empty" message. We do not check here for maximum length, because bbcode, smilies, etc. can add to the length.
// The maximum length check happened before any parsings.
! if ($mode === 'post' && utf8_clean_string($this->message) === '')
{
$this->warn_msg[] = $user->lang['TOO_FEW_CHARS'];
return (!$update_this_message) ? $return_message : $this->warn_msg;
***************
*** 1629,1635 ****
$this->message = $poll['poll_option_text'];
$bbcode_bitfield = $this->bbcode_bitfield;
! $poll['poll_option_text'] = $this->parse($poll['enable_bbcode'], ($config['allow_post_links']) ? $poll['enable_urls'] : false, $poll['enable_smilies'], $poll['img_status'], false, false, $config['allow_post_links'], false);
$bbcode_bitfield = base64_encode(base64_decode($bbcode_bitfield) | base64_decode($this->bbcode_bitfield));
$this->message = $tmp_message;
--- 1640,1646 ----
$this->message = $poll['poll_option_text'];
$bbcode_bitfield = $this->bbcode_bitfield;
! $poll['poll_option_text'] = $this->parse($poll['enable_bbcode'], ($config['allow_post_links']) ? $poll['enable_urls'] : false, $poll['enable_smilies'], $poll['img_status'], false, false, $config['allow_post_links'], false, 'poll');
$bbcode_bitfield = base64_encode(base64_decode($bbcode_bitfield) | base64_decode($this->bbcode_bitfield));
$this->message = $tmp_message;
***************
*** 1652,1658 ****
{
$this->warn_msg[] = $user->lang['POLL_TITLE_TOO_LONG'];
}
! $poll['poll_title'] = $this->parse($poll['enable_bbcode'], ($config['allow_post_links']) ? $poll['enable_urls'] : false, $poll['enable_smilies'], $poll['img_status'], false, false, $config['allow_post_links'], false);
if (strlen($poll['poll_title']) > 255)
{
$this->warn_msg[] = $user->lang['POLL_TITLE_COMP_TOO_LONG'];
--- 1663,1669 ----
{
$this->warn_msg[] = $user->lang['POLL_TITLE_TOO_LONG'];
}
! $poll['poll_title'] = $this->parse($poll['enable_bbcode'], ($config['allow_post_links']) ? $poll['enable_urls'] : false, $poll['enable_smilies'], $poll['img_status'], false, false, $config['allow_post_links'], false, 'poll');
if (strlen($poll['poll_title']) > 255)
{
$this->warn_msg[] = $user->lang['POLL_TITLE_COMP_TOO_LONG'];
|
|
From: Joas S. <nic...@ph...> - 2009-07-30 13:48:18
|
Author: nickvergessen
Date: Thu Jul 30 14:47:27 2009
New Revision: 9893
Log:
Fix bug #48885, introduced in r9843
Authorised by: kellanved
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/functions_posting.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Thu Jul 30 14:47:27 2009
***************
*** 174,180 ****
<li>[Fix] Banning an already banned user states to be successful, but has no effect (Bug #47825 - Patch by Pyramide)</li>
<li>[Fix] Do not add style-parameter to URL again, after admin re-authentification (Bug #18005 - Patch by leviatan21)</li>
<li>[Fix] Do not cut post-message in between HTML-Entities on search.php (Bug #31505 - Patch by leviatan21)</li>
! <li>[Fix] Correctly set attachment flag for topics, posts and pms after deleting attachments (Bug #48265 - Patch by WorldWar and nickvergessen)</li>
<li>[Fix] Display "Locked" button instead of "Reply" one for locked forum in viewtopic (prosilver). (Bug #38055 - Patch by Raimon)</li>
<li>[Fix] Correctly propagate umlauts over search result pages (Bug #33755)</li>
<li>[Fix] Preserve post options when refusing to save the post as a draft. (Bug #39115)</li>
--- 174,180 ----
<li>[Fix] Banning an already banned user states to be successful, but has no effect (Bug #47825 - Patch by Pyramide)</li>
<li>[Fix] Do not add style-parameter to URL again, after admin re-authentification (Bug #18005 - Patch by leviatan21)</li>
<li>[Fix] Do not cut post-message in between HTML-Entities on search.php (Bug #31505 - Patch by leviatan21)</li>
! <li>[Fix] Correctly set attachment flag for topics, posts and pms after deleting attachments (Bug #48265 - Patch by MarcoDM and nickvergessen)</li>
<li>[Fix] Display "Locked" button instead of "Reply" one for locked forum in viewtopic (prosilver). (Bug #38055 - Patch by Raimon)</li>
<li>[Fix] Correctly propagate umlauts over search result pages (Bug #33755)</li>
<li>[Fix] Preserve post options when refusing to save the post as a draft. (Bug #39115)</li>
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_posting.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_posting.php Thu Jul 30 14:47:27 2009
***************
*** 1553,1560 ****
{
$sql = 'SELECT 1 AS has_attachments
FROM ' . ATTACHMENTS_TABLE . '
! WHERE ' . $db->sql_in_set('topic_id', $topic_ids);
! $result = $db->sql_query($sql);
$has_attachments = (int) $db->sql_fetchfield('has_attachments');
$db->sql_freeresult($result);
--- 1553,1560 ----
{
$sql = 'SELECT 1 AS has_attachments
FROM ' . ATTACHMENTS_TABLE . '
! WHERE topic_id = ' . $topic_id;
! $result = $db->sql_query_limit($sql, 1);
$has_attachments = (int) $db->sql_fetchfield('has_attachments');
$db->sql_freeresult($result);
|
|
From: Andreas F. <ba...@ph...> - 2009-07-29 23:00:45
|
Author: bantu
Date: Wed Jul 29 23:59:51 2009
New Revision: 9891
Log:
Props.
Modified:
branches/phpBB-3_0_0/phpBB/includes/acm/acm_apc.php (props changed)
branches/phpBB-3_0_0/phpBB/includes/acm/acm_eaccelerator.php (props changed)
branches/phpBB-3_0_0/phpBB/includes/acm/acm_null.php (props changed)
branches/phpBB-3_0_0/phpBB/includes/acm/acm_xcache.php (props changed)
branches/phpBB-3_0_0/phpBB/includes/captcha/captcha_factory.php (props changed)
branches/phpBB-3_0_0/phpBB/includes/captcha/captcha_gd_wave.php (props changed)
branches/phpBB-3_0_0/phpBB/includes/captcha/captcha_plugin.php (props changed)
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php (props changed)
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php (props changed)
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php (props changed)
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php (props changed)
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php (contents, props changed)
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php (props changed)
Propchange: branches/phpBB-3_0_0/phpBB/includes/acm/acm_apc.php
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/includes/acm/acm_eaccelerator.php
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/includes/acm/acm_null.php
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/includes/acm/acm_xcache.php
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/includes/captcha/captcha_factory.php
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/includes/captcha/captcha_gd_wave.php
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/includes/captcha/captcha_plugin.php
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
------------------------------------------------------------------------------
svn:eol-style = LF
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 Wed Jul 29 23:59:51 2009
***************
*** 2,8 ****
/**
*
* @package VC
! * @version $Id: captcha_abstract.php 9709 2009-06-30 14:23:16Z Kellanved $
* @copyright (c) 2006, 2008 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
--- 2,8 ----
/**
*
* @package VC
! * @version $Id$
* @copyright (c) 2006, 2008 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
Propchange: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
------------------------------------------------------------------------------
svn:eol-style = LF
|
|
From: Meik S. <acy...@ph...> - 2009-07-29 09:38:08
|
Author: acydburn
Date: Wed Jul 29 10:37:21 2009
New Revision: 9890
Log: (empty)
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html
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 Wed Jul 29 10:37:21 2009
***************
*** 14,21 ****
<p>{L_ADMIN_INTRO}</p>
- <!-- version check -->
-
<!-- IF S_VERSIONCHECK_FAIL -->
<div class="errorbox notice">
<p>{L_VERSIONCHECK_FAIL}</p>
--- 14,19 ----
|
|
From: Meik S. <acy...@ph...> - 2009-07-29 09:27:36
|
Author: acydburn
Date: Wed Jul 29 10:26:50 2009
New Revision: 9889
Log:
Slightly adjust version check on index page to be a bit more descriptive
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html
branches/phpBB-3_0_0/phpBB/includes/acp/acp_main.php
branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
branches/phpBB-3_0_0/phpBB/language/en/install.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 Wed Jul 29 10:26:50 2009
***************
*** 14,34 ****
<p>{L_ADMIN_INTRO}</p>
<!-- IF S_VERSIONCHECK_FAIL -->
<div class="errorbox notice">
! <p>{L_VERSIONCHECK_FAIL} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> - <a href="{U_VERSIONCHECK}">{L_MORE}</a></p>
! </div>
<!-- ELSE -->
<!-- IF S_VERSION_UP_TO_DATE -->
<div class="successbox">
! <p>{L_VERSION_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> - <a href="{U_VERSIONCHECK}">{L_MORE}</a></p>
! </div>
<!-- ELSE -->
<div class="errorbox">
! <p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> - <a href="{U_VERSIONCHECK}">{L_MORE}</a></p>
! </div>
<!-- ENDIF -->
<!-- ENDIF -->
<!-- IF S_REMOVE_INSTALL -->
<div class="errorbox">
--- 14,35 ----
<p>{L_ADMIN_INTRO}</p>
+ <!-- version check -->
+
<!-- IF S_VERSIONCHECK_FAIL -->
<div class="errorbox notice">
! <p>{L_VERSIONCHECK_FAIL}</p>
<!-- ELSE -->
<!-- IF S_VERSION_UP_TO_DATE -->
<div class="successbox">
! <p>{L_VERSION_UP_TO_DATE_ACP}</p>
<!-- ELSE -->
<div class="errorbox">
! <p>{L_VERSION_NOT_UP_TO_DATE_TITLE}</p>
<!-- ENDIF -->
<!-- ENDIF -->
+ <p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> · <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
+ </div>
<!-- IF S_REMOVE_INSTALL -->
<div class="errorbox">
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 Wed Jul 29 10:26:50 2009
***************
*** 345,359 ****
add_log('admin', 'LOG_PURGE_CACHE');
break;
!
case 'purge_sessions':
if ((int) $user->data['user_type'] !== USER_FOUNDER)
{
trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
}
!
$tables = array(CONFIRM_TABLE, SESSIONS_TABLE);
!
foreach ($tables as $table)
{
switch ($db->sql_layer)
--- 345,359 ----
add_log('admin', 'LOG_PURGE_CACHE');
break;
!
case 'purge_sessions':
if ((int) $user->data['user_type'] !== USER_FOUNDER)
{
trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
}
!
$tables = array(CONFIRM_TABLE, SESSIONS_TABLE);
!
foreach ($tables as $table)
{
switch ($db->sql_layer)
***************
*** 368,374 ****
break;
}
}
!
// let's restore the admin session
$reinsert_ary = array(
'session_id' => (string) $user->session_id,
--- 368,374 ----
break;
}
}
!
// let's restore the admin session
$reinsert_ary = array(
'session_id' => (string) $user->session_id,
***************
*** 385,394 ****
'session_admin' => 1,
'session_viewonline' => (int) $user->data['session_viewonline'],
);
!
$sql = 'INSERT INTO ' . SESSIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $reinsert_ary);
$db->sql_query($sql);
!
add_log('admin', 'LOG_PURGE_SESSIONS');
break;
}
--- 385,394 ----
'session_admin' => 1,
'session_viewonline' => (int) $user->data['session_viewonline'],
);
!
$sql = 'INSERT INTO ' . SESSIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $reinsert_ary);
$db->sql_query($sql);
!
add_log('admin', 'LOG_PURGE_SESSIONS');
break;
}
***************
*** 406,417 ****
else
{
$latest_version_info = explode("\n", $latest_version_info);
! $latest_version = trim($latest_version_info[0]);
! $template->assign_var('S_VERSION_UP_TO_DATE',
! version_compare(
! str_replace('rc', 'RC', strtolower($config['version'])),
! str_replace('rc', 'RC', strtolower($latest_version)),
! '<') ? false : true);
}
// Get forum statistics
--- 406,418 ----
else
{
$latest_version_info = explode("\n", $latest_version_info);
!
! $latest_version = str_replace('rc', 'RC', strtolower(trim($latest_version_info[0])));
! $current_version = str_replace('rc', 'RC', strtolower($config['version']));
!
! $template->assign_vars(array(
! 'S_VERSION_UP_TO_DATE' => version_compare($current_version, $latest_version, '<') ? false : true,
! ));
}
// Get forum statistics
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/common.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/common.php Wed Jul 29 10:26:50 2009
***************
*** 250,256 ****
'MANAGE' => 'Manage',
'MENU_TOGGLE' => 'Hide or display the side menu',
! 'MORE' => 'More »',
'MOVE_DOWN' => 'Move down',
'MOVE_UP' => 'Move up',
--- 250,257 ----
'MANAGE' => 'Manage',
'MENU_TOGGLE' => 'Hide or display the side menu',
! 'MORE' => 'More', // Not used at the moment
! 'MORE_INFORMATION' => 'More information »',
'MOVE_DOWN' => 'Move down',
'MOVE_UP' => 'Move up',
***************
*** 377,383 ****
'USERS_PER_DAY' => 'Users per day',
'VALUE' => 'Value',
! 'VERSIONCHECK_FAIL' => 'Failed to obtain latest version',
'VERSIONCHECK_FORCE_UPDATE' => 'Re-Check version',
'VIEW_ADMIN_LOG' => 'View administrator log',
'VIEW_INACTIVE_USERS' => 'View inactive users',
--- 378,384 ----
'USERS_PER_DAY' => 'Users per day',
'VALUE' => 'Value',
! 'VERSIONCHECK_FAIL' => 'Failed to obtain latest version information.',
'VERSIONCHECK_FORCE_UPDATE' => 'Re-Check version',
'VIEW_ADMIN_LOG' => 'View administrator log',
'VIEW_INACTIVE_USERS' => 'View inactive users',
Modified: branches/phpBB-3_0_0/phpBB/language/en/install.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/install.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/install.php Wed Jul 29 10:26:50 2009
***************
*** 564,569 ****
--- 564,570 ----
'VERSION_CHECK_EXPLAIN' => 'Checks to see if the version of phpBB you are currently running is up to date.',
'VERSION_NOT_UP_TO_DATE' => 'Your version of phpBB is not up to date. Please continue the update process.',
'VERSION_NOT_UP_TO_DATE_ACP'=> 'Your version of phpBB is not up to date.<br />Below you will find a link to the release announcement for the latest version as well as instructions on how to perform the update.',
+ 'VERSION_NOT_UP_TO_DATE_TITLE' => 'Your version of phpBB is not up to date.',
'VERSION_UP_TO_DATE' => 'Your installation is up to date, no updates are available for your version of phpBB. You may want to continue anyway to perform a file validity check.',
'VERSION_UP_TO_DATE_ACP' => 'Your installation is up to date, no updates are available for your version of phpBB. You do not need to update your installation.',
'VIEWING_FILE_CONTENTS' => 'Viewing file contents',
|
|
From: Andreas F. <ba...@ph...> - 2009-07-28 22:19:05
|
Author: bantu
Date: Tue Jul 28 23:18:39 2009
New Revision: 9888
Log:
Fix r9887. Remove duplicate content.
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/permission_forum_copy.html
Modified: branches/phpBB-3_0_0/phpBB/adm/style/permission_forum_copy.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/permission_forum_copy.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/permission_forum_copy.html Tue Jul 28 23:18:39 2009
***************
*** 38,120 ****
</form>
<!-- INCLUDE overall_footer.html -->
- <!-- INCLUDE overall_header.html -->
-
- <a name="maincontent"></a>
-
- <h1>{L_ACP_FORUM_PERMISSIONS_COPY}</h1>
-
- {L_ACP_FORUM_PERMISSIONS_COPY_EXPLAIN}
-
- <form id="forum_perm_copy" method="post" action="{U_ACTION}">
-
- <fieldset>
- <legend>{L_LOOK_UP_FORUM}</legend>
-
- <dl>
- <dt><label for="src_forum">{L_COPY_PERMISSIONS_FROM}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span></dt>
- <dd><select id="src_forum" name="src_forum_id"><option value="0">{L_SELECT_FORUM}</option><option value="-1">------------------</option>{S_FORUM_OPTIONS}</select></dd>
- </dl>
- </fieldset>
-
- <fieldset>
- <legend>{L_LOOK_UP_FORUM}</legend>
- <p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
-
- <dl>
- <dt><label for="dest_forums">{L_COPY_PERMISSIONS_TO}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span></dt>
- <dd><select id="dest_forums" name="dest_forum_ids[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
- </dl>
- </fieldset>
-
- <fieldset class="submit-buttons">
- <legend>{L_SUBMIT}</legend>
- <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
- <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
- {S_HIDDEN_FIELDS}
- {S_FORM_TOKEN}
- </fieldset>
-
- </form>
-
- <!-- INCLUDE overall_footer.html -->
- <!-- INCLUDE overall_header.html -->
-
- <a name="maincontent"></a>
-
- <h1>{L_ACP_FORUM_PERMISSIONS_COPY}</h1>
-
- {L_ACP_FORUM_PERMISSIONS_COPY_EXPLAIN}
-
- <form id="forum_perm_copy" method="post" action="{U_ACTION}">
-
- <fieldset>
- <legend>{L_LOOK_UP_FORUM}</legend>
-
- <dl>
- <dt><label for="src_forum">{L_COPY_PERMISSIONS_FROM}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span></dt>
- <dd><select id="src_forum" name="src_forum_id"><option value="0">{L_SELECT_FORUM}</option><option value="-1">------------------</option>{S_FORUM_OPTIONS}</select></dd>
- </dl>
- </fieldset>
-
- <fieldset>
- <legend>{L_LOOK_UP_FORUM}</legend>
- <p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
-
- <dl>
- <dt><label for="dest_forums">{L_COPY_PERMISSIONS_TO}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span></dt>
- <dd><select id="dest_forums" name="dest_forum_ids[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
- </dl>
- </fieldset>
-
- <fieldset class="submit-buttons">
- <legend>{L_SUBMIT}</legend>
- <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
- <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
- {S_HIDDEN_FIELDS}
- {S_FORM_TOKEN}
- </fieldset>
-
- </form>
-
- <!-- INCLUDE overall_footer.html -->
--- 38,40 ----
|
|
From: Andreas F. <ba...@ph...> - 2009-07-28 22:10:38
|
Author: bantu
Date: Tue Jul 28 23:09:46 2009
New Revision: 9887
Log:
[Feature] Ability to copy permissions from one forum to several other forums.
[Fix] Add log entry when copying forum permissions.
Added:
branches/phpBB-3_0_0/phpBB/adm/style/permission_forum_copy.html (with props)
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php
branches/phpBB-3_0_0/phpBB/includes/acp/acp_permissions.php
branches/phpBB-3_0_0/phpBB/includes/acp/info/acp_permissions.php
branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
branches/phpBB-3_0_0/phpBB/install/database_update.php
branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
branches/phpBB-3_0_0/phpBB/language/en/acp/permissions.php
Added: branches/phpBB-3_0_0/phpBB/adm/style/permission_forum_copy.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/permission_forum_copy.html (added)
--- branches/phpBB-3_0_0/phpBB/adm/style/permission_forum_copy.html Tue Jul 28 23:09:46 2009
***************
*** 0 ****
--- 1,120 ----
+ <!-- INCLUDE overall_header.html -->
+
+ <a name="maincontent"></a>
+
+ <h1>{L_ACP_FORUM_PERMISSIONS_COPY}</h1>
+
+ {L_ACP_FORUM_PERMISSIONS_COPY_EXPLAIN}
+
+ <form id="forum_perm_copy" method="post" action="{U_ACTION}">
+
+ <fieldset>
+ <legend>{L_LOOK_UP_FORUM}</legend>
+
+ <dl>
+ <dt><label for="src_forum">{L_COPY_PERMISSIONS_FROM}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span></dt>
+ <dd><select id="src_forum" name="src_forum_id"><option value="0">{L_SELECT_FORUM}</option><option value="-1">------------------</option>{S_FORUM_OPTIONS}</select></dd>
+ </dl>
+ </fieldset>
+
+ <fieldset>
+ <legend>{L_LOOK_UP_FORUM}</legend>
+ <p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
+
+ <dl>
+ <dt><label for="dest_forums">{L_COPY_PERMISSIONS_TO}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span></dt>
+ <dd><select id="dest_forums" name="dest_forum_ids[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
+ </dl>
+ </fieldset>
+
+ <fieldset class="submit-buttons">
+ <legend>{L_SUBMIT}</legend>
+ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
+ <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+ {S_HIDDEN_FIELDS}
+ {S_FORM_TOKEN}
+ </fieldset>
+
+ </form>
+
+ <!-- INCLUDE overall_footer.html -->
+ <!-- INCLUDE overall_header.html -->
+
+ <a name="maincontent"></a>
+
+ <h1>{L_ACP_FORUM_PERMISSIONS_COPY}</h1>
+
+ {L_ACP_FORUM_PERMISSIONS_COPY_EXPLAIN}
+
+ <form id="forum_perm_copy" method="post" action="{U_ACTION}">
+
+ <fieldset>
+ <legend>{L_LOOK_UP_FORUM}</legend>
+
+ <dl>
+ <dt><label for="src_forum">{L_COPY_PERMISSIONS_FROM}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span></dt>
+ <dd><select id="src_forum" name="src_forum_id"><option value="0">{L_SELECT_FORUM}</option><option value="-1">------------------</option>{S_FORUM_OPTIONS}</select></dd>
+ </dl>
+ </fieldset>
+
+ <fieldset>
+ <legend>{L_LOOK_UP_FORUM}</legend>
+ <p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
+
+ <dl>
+ <dt><label for="dest_forums">{L_COPY_PERMISSIONS_TO}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span></dt>
+ <dd><select id="dest_forums" name="dest_forum_ids[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
+ </dl>
+ </fieldset>
+
+ <fieldset class="submit-buttons">
+ <legend>{L_SUBMIT}</legend>
+ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
+ <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+ {S_HIDDEN_FIELDS}
+ {S_FORM_TOKEN}
+ </fieldset>
+
+ </form>
+
+ <!-- INCLUDE overall_footer.html -->
+ <!-- INCLUDE overall_header.html -->
+
+ <a name="maincontent"></a>
+
+ <h1>{L_ACP_FORUM_PERMISSIONS_COPY}</h1>
+
+ {L_ACP_FORUM_PERMISSIONS_COPY_EXPLAIN}
+
+ <form id="forum_perm_copy" method="post" action="{U_ACTION}">
+
+ <fieldset>
+ <legend>{L_LOOK_UP_FORUM}</legend>
+
+ <dl>
+ <dt><label for="src_forum">{L_COPY_PERMISSIONS_FROM}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span></dt>
+ <dd><select id="src_forum" name="src_forum_id"><option value="0">{L_SELECT_FORUM}</option><option value="-1">------------------</option>{S_FORUM_OPTIONS}</select></dd>
+ </dl>
+ </fieldset>
+
+ <fieldset>
+ <legend>{L_LOOK_UP_FORUM}</legend>
+ <p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
+
+ <dl>
+ <dt><label for="dest_forums">{L_COPY_PERMISSIONS_TO}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span></dt>
+ <dd><select id="dest_forums" name="dest_forum_ids[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
+ </dl>
+ </fieldset>
+
+ <fieldset class="submit-buttons">
+ <legend>{L_SUBMIT}</legend>
+ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
+ <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+ {S_HIDDEN_FIELDS}
+ {S_FORM_TOKEN}
+ </fieldset>
+
+ </form>
+
+ <!-- INCLUDE overall_footer.html -->
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/permission_forum_copy.html
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: branches/phpBB-3_0_0/phpBB/adm/style/permission_forum_copy.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Tue Jul 28 23:09:46 2009
***************
*** 180,185 ****
--- 180,186 ----
<li>[Fix] Preserve post options when refusing to save the post as a draft. (Bug #39115)</li>
<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>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
<li>[Change] Template engine now permits to a limited extent variable includes.</li>
***************
*** 249,254 ****
--- 250,256 ----
</ul>
</li>
<li>[Feature] Display version check on ACP main page.</li>
+ <li>[Feature] Ability to copy permissions from one forum to several other forums.</li>
</ul>
<a name="v304"></a><h3>1.ii. Changes since 3.0.4</h3>
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php Tue Jul 28 23:09:46 2009
***************
*** 187,249 ****
if (!empty($forum_perm_from) && $forum_perm_from != $forum_data['forum_id'] &&
(($action != 'edit') || empty($forum_id) || ($auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth'))))
{
! // if we edit a forum delete current permissions first
! if ($action == 'edit')
! {
! $sql = 'DELETE FROM ' . ACL_USERS_TABLE . '
! WHERE forum_id = ' . (int) $forum_data['forum_id'];
! $db->sql_query($sql);
!
! $sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . '
! WHERE forum_id = ' . (int) $forum_data['forum_id'];
! $db->sql_query($sql);
! }
!
! // From the mysql documentation:
! // Prior to MySQL 4.0.14, the target table of the INSERT statement cannot appear in the FROM clause of the SELECT part of the query. This limitation is lifted in 4.0.14.
! // Due to this we stay on the safe side if we do the insertion "the manual way"
!
! // Copy permisisons from/to the acl users table (only forum_id gets changed)
! $sql = 'SELECT user_id, auth_option_id, auth_role_id, auth_setting
! FROM ' . ACL_USERS_TABLE . '
! WHERE forum_id = ' . $forum_perm_from;
! $result = $db->sql_query($sql);
!
! $users_sql_ary = array();
! while ($row = $db->sql_fetchrow($result))
! {
! $users_sql_ary[] = array(
! 'user_id' => (int) $row['user_id'],
! 'forum_id' => (int) $forum_data['forum_id'],
! 'auth_option_id' => (int) $row['auth_option_id'],
! 'auth_role_id' => (int) $row['auth_role_id'],
! 'auth_setting' => (int) $row['auth_setting']
! );
! }
! $db->sql_freeresult($result);
!
! // Copy permisisons from/to the acl groups table (only forum_id gets changed)
! $sql = 'SELECT group_id, auth_option_id, auth_role_id, auth_setting
! FROM ' . ACL_GROUPS_TABLE . '
! WHERE forum_id = ' . $forum_perm_from;
! $result = $db->sql_query($sql);
!
! $groups_sql_ary = array();
! while ($row = $db->sql_fetchrow($result))
! {
! $groups_sql_ary[] = array(
! 'group_id' => (int) $row['group_id'],
! 'forum_id' => (int) $forum_data['forum_id'],
! 'auth_option_id' => (int) $row['auth_option_id'],
! 'auth_role_id' => (int) $row['auth_role_id'],
! 'auth_setting' => (int) $row['auth_setting']
! );
! }
! $db->sql_freeresult($result);
!
! // Now insert the data
! $db->sql_multi_insert(ACL_USERS_TABLE, $users_sql_ary);
! $db->sql_multi_insert(ACL_GROUPS_TABLE, $groups_sql_ary);
cache_moderators();
}
--- 187,193 ----
if (!empty($forum_perm_from) && $forum_perm_from != $forum_data['forum_id'] &&
(($action != 'edit') || empty($forum_id) || ($auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth'))))
{
! copy_forum_permissions($forum_perm_from, $forum_data['forum_id'], ($action == 'edit') ? true : false);
cache_moderators();
}
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_permissions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_permissions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_permissions.php Tue Jul 28 23:09:46 2009
***************
*** 57,62 ****
--- 57,77 ----
trigger_error('NO_MODE', E_USER_ERROR);
}
+ // Copy forum permissions
+ if ($mode == 'setting_forum_copy')
+ {
+ $this->tpl_name = 'permission_forum_copy';
+
+ if ($auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth'))
+ {
+ $this->page_title = 'ACP_FORUM_PERMISSIONS_COPY';
+ $this->copy_forum_permissions();
+ return;
+ }
+
+ trigger_error('NO_MODE', E_USER_ERROR);
+ }
+
// Set some vars
$action = request_var('action', array('' => 0));
$action = key($action);
***************
*** 1153,1158 ****
--- 1168,1224 ----
}
/**
+ * Handles copying permissions from one forum to others
+ */
+ function copy_forum_permissions()
+ {
+ global $auth, $cache, $template, $user;
+
+ $user->add_lang('acp/forums');
+
+ $submit = isset($_POST['submit']) ? true : false;
+
+ if ($submit)
+ {
+ $src = request_var('src_forum_id', 0);
+ $dest = request_var('dest_forum_ids', array(0));
+
+ if (confirm_box(true))
+ {
+ if (copy_forum_permissions($src, $dest))
+ {
+ cache_moderators();
+
+ $auth->acl_clear_prefetch();
+ $cache->destroy('sql', FORUMS_TABLE);
+
+ trigger_error($user->lang['AUTH_UPDATED'] . adm_back_link($this->u_action));
+ }
+ else
+ {
+ trigger_error($user->lang['SELECTED_FORUM_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING);
+ }
+ }
+ else
+ {
+ $s_hidden_fields = array(
+ 'submit' => $submit,
+ 'src_forum_id' => $src,
+ 'dest_forum_ids' => $dest,
+ );
+
+ $s_hidden_fields = build_hidden_fields($s_hidden_fields);
+
+ confirm_box(false, $user->lang['CONFIRM_OPERATION'] . ' ' . $user->lang['COPY_PERMISSIONS_CONFIRM'], $s_hidden_fields);
+ }
+ }
+
+ $template->assign_vars(array(
+ 'S_FORUM_OPTIONS' => make_forum_select(false, false, false, false, false),
+ ));
+ }
+
+ /**
* Get already assigned users/groups
*/
function retrieve_defined_user_groups($permission_scope, $forum_id, $permission_type)
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/info/acp_permissions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/info/acp_permissions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/info/acp_permissions.php Tue Jul 28 23:09:46 2009
***************
*** 24,29 ****
--- 24,30 ----
'trace' => array('title' => 'ACP_PERMISSION_TRACE', 'auth' => 'acl_a_viewauth', 'display' => false, 'cat' => array('ACP_PERMISSION_MASKS')),
'setting_forum_local' => array('title' => 'ACP_FORUM_PERMISSIONS', 'auth' => 'acl_a_fauth && (acl_a_authusers || acl_a_authgroups)', 'cat' => array('ACP_FORUM_BASED_PERMISSIONS')),
+ 'setting_forum_copy' => array('title' => 'ACP_FORUM_PERMISSIONS_COPY', 'auth' => 'acl_a_fauth && acl_a_authusers && acl_a_authgroups && acl_a_mauth', 'cat' => array('ACP_FORUM_BASED_PERMISSIONS')),
'setting_mod_local' => array('title' => 'ACP_FORUM_MODERATORS', 'auth' => 'acl_a_mauth && (acl_a_authusers || acl_a_authgroups)', 'cat' => array('ACP_FORUM_BASED_PERMISSIONS')),
'setting_user_global' => array('title' => 'ACP_USERS_PERMISSIONS', 'auth' => 'acl_a_authusers && (acl_a_aauth || acl_a_mauth || acl_a_uauth)', 'cat' => array('ACP_GLOBAL_PERMISSIONS', 'ACP_CAT_USERS')),
'setting_user_local' => array('title' => 'ACP_USERS_FORUM_PERMISSIONS', 'auth' => 'acl_a_authusers && (acl_a_mauth || acl_a_fauth)', 'cat' => array('ACP_FORUM_BASED_PERMISSIONS', 'ACP_CAT_USERS')),
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_admin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_admin.php Tue Jul 28 23:09:46 2009
***************
*** 307,312 ****
--- 307,455 ----
}
/**
+ * Copies permissions from one forum to others
+ *
+ * @param int $src_forum_id The source forum we want to copy permissions from
+ * @param array $dest_forum_ids The destination forum(s) we want to copy to
+ * @param bool $clear_dest_perms True if destination permissions should be deleted
+ * @param bool $add_log True if log entry should be added
+ *
+ * @return bool False on error
+ *
+ * @author bantu
+ */
+ function copy_forum_permissions($src_forum_id, $dest_forum_ids, $clear_dest_perms = true, $add_log = true)
+ {
+ global $db;
+
+ // Only one forum id specified
+ if (!is_array($dest_forum_ids))
+ {
+ $dest_forum_ids = array($dest_forum_ids);
+ }
+
+ // Make sure forum ids are integers
+ $src_forum_id = (int) $src_forum_id;
+ $dest_forum_ids = array_map('intval', $dest_forum_ids);
+
+ // No source forum or no destination forums specified
+ if (empty($src_forum_id) || empty($dest_forum_ids))
+ {
+ return false;
+ }
+
+ // Check if source forums exists
+ $sql = 'SELECT forum_name
+ FROM ' . FORUMS_TABLE . '
+ WHERE forum_id = ' . $src_forum_id;
+ $result = $db->sql_query($sql);
+ $src_forum_name = $db->sql_fetchfield('forum_name');
+
+ // Source forum doesn't exist
+ if (empty($src_forum_name))
+ {
+ return false;
+ }
+
+ // Check if destination forums exists
+ $sql = 'SELECT forum_id, forum_name
+ FROM ' . FORUMS_TABLE . '
+ WHERE ' . $db->sql_in_set('forum_id', $dest_forum_ids);
+ $result = $db->sql_query($sql);
+
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $dest_forum_ids[] = (int) $row['forum_id'];
+ $dest_forum_names[] = $row['forum_name'];
+ }
+ $db->sql_freeresult($result);
+
+ // No destination forum exists
+ if (empty($dest_forum_ids))
+ {
+ return false;
+ }
+
+ // From the mysql documentation:
+ // Prior to MySQL 4.0.14, the target table of the INSERT statement cannot appear
+ // in the FROM clause of the SELECT part of the query. This limitation is lifted in 4.0.14.
+ // Due to this we stay on the safe side if we do the insertion "the manual way"
+
+ // Rowsets we're going to insert
+ $users_sql_ary = $groups_sql_ary = array();
+
+ // Query acl users table for source forum data
+ $sql = 'SELECT user_id, auth_option_id, auth_role_id, auth_setting
+ FROM ' . ACL_USERS_TABLE . '
+ WHERE forum_id = ' . $src_forum_id;
+ $result = $db->sql_query($sql);
+
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $row = array(
+ 'user_id' => (int) $row['user_id'],
+ 'auth_option_id' => (int) $row['auth_option_id'],
+ 'auth_role_id' => (int) $row['auth_role_id'],
+ 'auth_setting' => (int) $row['auth_setting'],
+ );
+
+ foreach ($dest_forum_ids as $dest_forum_id)
+ {
+ $users_sql_ary[] = $row + array('forum_id' => $dest_forum_id);
+ }
+ }
+ $db->sql_freeresult($result);
+
+ // Query acl groups table for source forum data
+ $sql = 'SELECT group_id, auth_option_id, auth_role_id, auth_setting
+ FROM ' . ACL_GROUPS_TABLE . '
+ WHERE forum_id = ' . $src_forum_id;
+ $result = $db->sql_query($sql);
+
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $row = array(
+ 'group_id' => (int) $row['group_id'],
+ 'auth_option_id' => (int) $row['auth_option_id'],
+ 'auth_role_id' => (int) $row['auth_role_id'],
+ 'auth_setting' => (int) $row['auth_setting'],
+ );
+
+ foreach ($dest_forum_ids as $dest_forum_id)
+ {
+ $groups_sql_ary[] = $row + array('forum_id' => $dest_forum_id);
+ }
+ }
+ $db->sql_freeresult($result);
+
+ $db->sql_transaction('begin');
+
+ // Clear current permissions of destination forums
+ if ($clear_dest_perms)
+ {
+ $sql = 'DELETE FROM ' . ACL_USERS_TABLE . '
+ WHERE ' . $db->sql_in_set('forum_id', $dest_forum_ids);
+ $db->sql_query($sql);
+
+ $sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . '
+ WHERE ' . $db->sql_in_set('forum_id', $dest_forum_ids);
+ $db->sql_query($sql);
+ }
+
+ $db->sql_multi_insert(ACL_USERS_TABLE, $users_sql_ary);
+ $db->sql_multi_insert(ACL_GROUPS_TABLE, $groups_sql_ary);
+
+ if ($add_log)
+ {
+ add_log('admin', 'LOG_FORUM_COPIED_PERMISSIONS', $src_forum_name, implode(', ', $dest_forum_names));
+ }
+
+ $db->sql_transaction('commit');
+
+ return true;
+ }
+
+ /**
* Get physical file listing
*/
function filelist($rootdir, $dir = '', $type = 'gif|jpg|jpeg|png')
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 Jul 28 23:09:46 2009
***************
*** 1235,1240 ****
--- 1235,1283 ----
}
$db->sql_freeresult($result);
+ // Also install the "Copy forum permissions" module
+ $sql = 'SELECT module_id
+ FROM ' . MODULES_TABLE . "
+ WHERE module_class = 'acp'
+ AND module_langname = 'ACP_FORUM_BASED_PERMISSIONS'
+ AND module_mode = ''
+ AND module_basename = ''";
+ $result = $db->sql_query($sql);
+
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $category_id = (int) $row['module_id'];
+
+ // Check if we actually need to add the feed module or if it is already added. ;)
+ $sql = 'SELECT *
+ FROM ' . MODULES_TABLE . "
+ WHERE module_class = 'acp'
+ AND module_langname = 'ACP_FORUM_PERMISSIONS_COPY'
+ AND module_mode = 'setting_forum_copy'
+ AND module_auth = 'acl_a_fauth && acl_a_authusers && acl_a_authgroups && acl_a_mauth'
+ AND parent_id = {$category_id}";
+ $result2 = $db->sql_query($sql);
+ $row2 = $db->sql_fetchrow($result2);
+ $db->sql_freeresult($result2);
+
+ if (!$row2)
+ {
+ $module_data = array(
+ 'module_basename' => 'permissions',
+ 'module_enabled' => 1,
+ 'module_display' => 1,
+ 'parent_id' => $category_id,
+ 'module_class' => 'acp',
+ 'module_langname' => 'ACP_FORUM_PERMISSIONS_COPY',
+ 'module_mode' => 'setting_forum_copy',
+ 'module_auth' => 'acl_a_fauth && acl_a_authusers && acl_a_authgroups && acl_a_mauth',
+ );
+
+ $_module->update_module_data($module_data, true);
+ }
+ }
+ $db->sql_freeresult($result);
+
$_module->remove_cache_file();
// Add newly_registered group... but check if it already exists (we always supported running the updater on any schema)
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/common.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/common.php Tue Jul 28 23:09:46 2009
***************
*** 88,93 ****
--- 88,94 ----
'ACP_FORUM_MANAGEMENT' => 'Forum management',
'ACP_FORUM_MODERATORS' => 'Forum moderators',
'ACP_FORUM_PERMISSIONS' => 'Forum permissions',
+ 'ACP_FORUM_PERMISSIONS_COPY' => 'Copy forum permissions',
'ACP_FORUM_ROLES' => 'Forum roles',
'ACP_GENERAL_CONFIGURATION' => 'General configuration',
***************
*** 545,550 ****
--- 546,552 ----
'LOG_ERROR_EMAIL' => '<strong>E-mail error</strong><br />» %s',
'LOG_FORUM_ADD' => '<strong>Created new forum</strong><br />» %s',
+ 'LOG_FORUM_COPIED_PERMISSIONS' => '<strong>Copied forum permissions</strong> from %1$s<br />» %2$s',
'LOG_FORUM_DEL_FORUM' => '<strong>Deleted forum</strong><br />» %s',
'LOG_FORUM_DEL_FORUMS' => '<strong>Deleted forum and its subforums</strong><br />» %s',
'LOG_FORUM_DEL_MOVE_FORUMS' => '<strong>Deleted forum and moved subforums</strong> to %1$s<br />» %2$s',
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/permissions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/permissions.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/permissions.php Tue Jul 28 23:09:46 2009
***************
*** 80,85 ****
--- 80,86 ----
'ACP_ADMINISTRATORS_EXPLAIN' => 'Here you can assign administrator permissions to users or groups. All users with administrator permissions can view the administration control panel.',
'ACP_FORUM_MODERATORS_EXPLAIN' => 'Here you can assign users and groups as forum moderators. To assign users access to forums, to define global moderative permissions or administrators please use the appropriate page.',
'ACP_FORUM_PERMISSIONS_EXPLAIN' => 'Here you can alter which users and groups can access which forums. To assign moderators or define administrators please use the appropriate page.',
+ 'ACP_FORUM_PERMISSIONS_COPY_EXPLAIN' => 'Here you can copy forum permissions from one forum to one or more other forums.',
'ACP_GLOBAL_MODERATORS_EXPLAIN' => 'Here you can assign global moderator permissions to users or groups. These moderators are like ordinary moderators except they have access to every forum on your board.',
'ACP_GROUPS_FORUM_PERMISSIONS_EXPLAIN' => 'Here you can assign forum permissions to groups.',
'ACP_GROUPS_PERMISSIONS_EXPLAIN' => 'Here you can assign global permissions to groups - user permissions, global moderator permissions and administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, et cetera; global moderator permissions such as approving posts, manage topics, manage bans, et cetera and lastly administrator permissions such as altering permissions, define custom BBCodes, manage forums, et cetera. Individual users permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the groupâs permissions.',
***************
*** 109,114 ****
--- 110,121 ----
'APPLY_PERMISSIONS_EXPLAIN' => 'The permissions and role defined for this item will only be applied to this item and all checked items.',
'AUTH_UPDATED' => 'Permissions have been updated.',
+ 'COPY_PERMISSIONS_CONFIRM' => 'Please be aware that this will overwrite any existing permissions on the selected targets.',
+ 'COPY_PERMISSIONS_FORUM_FROM_EXPLAIN' => 'The source forum you want to copy permissions from.',
+ 'COPY_PERMISSIONS_FORUM_TO_EXPLAIN' => 'The destination forums you want the copied permissions applied to.',
+ 'COPY_PERMISSIONS_FROM' => 'Copy permissions from',
+ 'COPY_PERMISSIONS_TO' => 'Apply permissions to',
+
'CREATE_ROLE' => 'Create role',
'CREATE_ROLE_FROM' => 'Use settings fromâ¦',
'CUSTOM' => 'Customâ¦',
|
|
From: Andreas F. <ba...@ph...> - 2009-07-28 21:33:55
|
Author: bantu
Date: Tue Jul 28 22:33:31 2009
New Revision: 9886
Log:
Fix r9696, #45115. Move column change to the correct version.
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 Jul 28 22:33:31 2009
***************
*** 679,689 ****
'forum_style' => array('UINT', 0),
),
),
- 'change_columns' => array(
- USERS_TABLE => array(
- 'user_options' => array('UINT:11', 230271),
- ),
- ),
),
// No changes from 3.0.5-RC1 to 3.0.5
--- 679,684 ----
***************
*** 710,715 ****
--- 705,715 ----
'pm_id' => array('UINT', 0),
),
),
+ 'change_columns' => array(
+ USERS_TABLE => array(
+ 'user_options' => array('UINT:11', 230271),
+ ),
+ ),
'add_index' => array(
LOG_TABLE => array(
'log_time' => array('log_time'),
|
|
From: Andreas F. <ba...@ph...> - 2009-07-28 20:35:07
|
Author: bantu
Date: Tue Jul 28 21:29:34 2009
New Revision: 9885
Log:
Fix tiny typo in r9884, #46765. Thanks rxu.
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 Jul 28 21:29:34 2009
***************
*** 1648,1654 ****
* Get list of unread topics
* only for registered users and non-cookie tracking
*
! * @param int $user_id User ID (or false for currect user)
* @param string $sql_extra Extra WHERE SQL statement
*
* @return array[int][int] Topic ids as keys, mark_time of topic as value
--- 1648,1654 ----
* Get list of unread topics
* only for registered users and non-cookie tracking
*
! * @param int $user_id User ID (or false for current user)
* @param string $sql_extra Extra WHERE SQL statement
*
* @return array[int][int] Topic ids as keys, mark_time of topic as value
|
|
From: Andreas F. <ba...@ph...> - 2009-07-28 15:31:27
|
Author: bantu
Date: Tue Jul 28 16:30:47 2009
New Revision: 9884
Log:
Move get_unread_topics_list() up in functions.php, added some documentation. Related to #46765
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 Jul 28 16:30:47 2009
***************
*** 1645,1650 ****
--- 1645,1761 ----
}
/**
+ * Get list of unread topics
+ * only for registered users and non-cookie tracking
+ *
+ * @param int $user_id User ID (or false for currect user)
+ * @param string $sql_extra Extra WHERE SQL statement
+ *
+ * @return array[int][int] Topic ids as keys, mark_time of topic as value
+ * @author rxu
+ */
+ function get_unread_topics_list($user_id = false, $sql_extra = '')
+ {
+ global $config, $db, $user;
+
+ if ($user_id === false)
+ {
+ $user_id = (int) $user->data['user_id'];
+ }
+
+ $tracked_topics_list = $unread_topics_list = $read_topics_list = array();
+ $tracked_forums_list = array();
+
+ if ($config['load_db_lastread'] && $user->data['is_registered'])
+ {
+ // List of the tracked forums (not ideal, hope the better way will be found)
+ // This list is to fetch later the forums user never read (fully) before
+ $sql = 'SELECT forum_id
+ FROM ' . FORUMS_TRACK_TABLE . "
+ WHERE user_id = $user_id";
+ $result = $db->sql_query($sql);
+
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $tracked_forums_list[] = (int) $row['forum_id'];
+ }
+ $db->sql_freeresult($result);
+
+ // Get list of the unread topics - on topics tracking as the first step
+ $sql = 'SELECT t.topic_id, t.topic_last_post_time, tt.mark_time
+ FROM ' . TOPICS_TABLE . ' t, ' . TOPICS_TRACK_TABLE . " tt
+ WHERE t.topic_id = tt.topic_id
+ AND t.topic_last_post_time >= tt.mark_time
+ AND tt.user_id = $user_id
+ $sql_extra
+ ORDER BY t.topic_last_post_time DESC";
+ $result = $db->sql_query($sql);
+
+ while ($row = $db->sql_fetchrow($result))
+ {
+ if ($row['topic_last_post_time'] == $row['mark_time'])
+ {
+ // Check if there're read topics for the forums having unread ones
+ $read_topics_list[$row['topic_id']] = (int) $row['mark_time'];
+ }
+ else
+ {
+ $unread_topics_list[$row['topic_id']] = (int) $row['mark_time'];
+ }
+ }
+ $db->sql_freeresult($result);
+
+ // Get the full list of the tracked topics
+ $tracked_topics_list = array_merge(array_keys($unread_topics_list), array_keys($read_topics_list));
+
+ // Get list of the unread topics - on forums tracking as the second step
+ // We don't take in account topics tracked before
+ $sql = 'SELECT t.topic_id, ft.mark_time
+ FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TRACK_TABLE . ' ft
+ WHERE t.forum_id = ft.forum_id
+ AND t.topic_last_post_time > ft.mark_time
+ AND ' . $db->sql_in_set('t.topic_id', $tracked_topics_list, true, true) . "
+ AND ft.user_id = $user_id
+ $sql_extra
+ ORDER BY t.topic_last_post_time DESC";
+ $result = $db->sql_query($sql);
+
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $unread_topics_list[$row['topic_id']] = (int) $row['mark_time'];
+ }
+ $db->sql_freeresult($result);
+
+ // Refresh the full list of the tracked topics
+ unset($tracked_topics_list);
+ $tracked_topics_list = array_merge(array_keys($unread_topics_list), array_keys($read_topics_list));
+
+ // And the last step - find unread topics were not found before (that can mean a user has never read some forums)
+ $sql = 'SELECT topic_id
+ FROM ' . TOPICS_TABLE . '
+ WHERE topic_last_post_time > ' . (int) $user->data['user_lastmark'] . '
+ AND ' . $db->sql_in_set('topic_id', $tracked_topics_list, true, true) . '
+ AND ' . $db->sql_in_set('forum_id', $tracked_forums_list, true, true) . "
+ $sql_extra
+ ORDER BY topic_last_post_time DESC";
+ $result = $db->sql_query_limit($sql, 1000);
+
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $unread_topics_list[$row['topic_id']] = (int) $user->data['user_lastmark'];
+ }
+ $db->sql_freeresult($result);
+ }
+ else if ($config['load_anon_lastread'] || $user->data['is_registered'])
+ {
+ // We do not implement unread topics list for cookie based tracking
+ // because it would require expensive database queries
+ }
+
+ return $unread_topics_list;
+ }
+
+ /**
* Check for read forums and update topic tracking info accordingly
*
* @param int $forum_id the forum id to check
***************
*** 4129,4237 ****
return;
}
- /*
- * Get list of unread topics
- * only for registered users and non-cookie tracking this function is used
- */
- function get_unread_topics_list($user_id = false, $sql_extra = '')
- {
- global $config, $db, $user;
-
- if ($user_id === false)
- {
- $user_id = (int) $user->data['user_id'];
- }
-
- $tracked_topics_list = $unread_topics_list = $read_topics_list = array();
- $tracked_forums_list = array();
-
- if ($config['load_db_lastread'] && $user->data['is_registered'])
- {
- // List of the tracked forums (not ideal, hope the better way will be found)
- // This list is to fetch later the forums user never read (fully) before
- $sql = 'SELECT forum_id
- FROM ' . FORUMS_TRACK_TABLE . "
- WHERE user_id = $user_id";
- $result = $db->sql_query($sql);
-
- while ($row = $db->sql_fetchrow($result))
- {
- $tracked_forums_list[] = (int) $row['forum_id'];
- }
- $db->sql_freeresult($result);
-
- // Get list of the unread topics - on topics tracking as the first step
- $sql = 'SELECT t.topic_id, t.topic_last_post_time, tt.mark_time
- FROM ' . TOPICS_TABLE . ' t, ' . TOPICS_TRACK_TABLE . " tt
- WHERE t.topic_id = tt.topic_id
- AND t.topic_last_post_time >= tt.mark_time
- AND tt.user_id = $user_id
- $sql_extra
- ORDER BY t.topic_last_post_time DESC";
- $result = $db->sql_query($sql);
-
- while ($row = $db->sql_fetchrow($result))
- {
- if ($row['topic_last_post_time'] == $row['mark_time'])
- {
- // Check if there're read topics for the forums having unread ones
- $read_topics_list[$row['topic_id']] = (int) $row['mark_time'];
- }
- else
- {
- $unread_topics_list[$row['topic_id']] = (int) $row['mark_time'];
- }
- }
- $db->sql_freeresult($result);
-
- // Get the full list of the tracked topics
- $tracked_topics_list = array_merge(array_keys($unread_topics_list), array_keys($read_topics_list));
-
- // Get list of the unread topics - on forums tracking as the second step
- // We don't take in account topics tracked before
- $sql = 'SELECT t.topic_id, ft.mark_time
- FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TRACK_TABLE . ' ft
- WHERE t.forum_id = ft.forum_id
- AND t.topic_last_post_time > ft.mark_time
- AND ' . $db->sql_in_set('t.topic_id', $tracked_topics_list, true, true) . "
- AND ft.user_id = $user_id
- $sql_extra
- ORDER BY t.topic_last_post_time DESC";
- $result = $db->sql_query($sql);
-
- while ($row = $db->sql_fetchrow($result))
- {
- $unread_topics_list[$row['topic_id']] = (int) $row['mark_time'];
- }
- $db->sql_freeresult($result);
-
- // Refresh the full list of the tracked topics
- unset($tracked_topics_list);
- $tracked_topics_list = array_merge(array_keys($unread_topics_list), array_keys($read_topics_list));
-
- // And the last step - find unread topics were not found before (that can mean a user has never read some forums)
- $sql = 'SELECT topic_id
- FROM ' . TOPICS_TABLE . '
- WHERE topic_last_post_time > ' . (int) $user->data['user_lastmark'] . '
- AND ' . $db->sql_in_set('topic_id', $tracked_topics_list, true, true) . '
- AND ' . $db->sql_in_set('forum_id', $tracked_forums_list, true, true) . "
- $sql_extra
- ORDER BY topic_last_post_time DESC";
- $result = $db->sql_query_limit($sql, 1000);
-
- while ($row = $db->sql_fetchrow($result))
- {
- $unread_topics_list[$row['topic_id']] = (int) $user->data['user_lastmark'];
- }
- $db->sql_freeresult($result);
- }
- else if ($config['load_anon_lastread'] || $user->data['is_registered'])
- {
- // We do not implement unread topics list for cookie based tracking
- // because it would require expensive database queries
- }
-
- return $unread_topics_list;
- }
-
?>
\ No newline at end of file
--- 4240,4243 ----
|
|
From: Andreas F. <ba...@ph...> - 2009-07-28 14:57:16
|
Author: bantu
Date: Tue Jul 28 15:56:39 2009
New Revision: 9883
Log:
More small adjustments to get_unread_topics_list(). #46765
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 Jul 28 15:56:39 2009
***************
*** 4139,4145 ****
if ($user_id === false)
{
! $user_id = $user->data['user_id'];
}
$tracked_topics_list = $unread_topics_list = $read_topics_list = array();
--- 4139,4145 ----
if ($user_id === false)
{
! $user_id = (int) $user->data['user_id'];
}
$tracked_topics_list = $unread_topics_list = $read_topics_list = array();
***************
*** 4151,4161 ****
// This list is to fetch later the forums user never read (fully) before
$sql = 'SELECT forum_id
FROM ' . FORUMS_TRACK_TABLE . "
! WHERE user_id = {$user_id}";
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
! $tracked_forums_list[] = $row['forum_id'];
}
$db->sql_freeresult($result);
--- 4151,4162 ----
// This list is to fetch later the forums user never read (fully) before
$sql = 'SELECT forum_id
FROM ' . FORUMS_TRACK_TABLE . "
! WHERE user_id = $user_id";
$result = $db->sql_query($sql);
+
while ($row = $db->sql_fetchrow($result))
{
! $tracked_forums_list[] = (int) $row['forum_id'];
}
$db->sql_freeresult($result);
***************
*** 4164,4183 ****
FROM ' . TOPICS_TABLE . ' t, ' . TOPICS_TRACK_TABLE . " tt
WHERE t.topic_id = tt.topic_id
AND t.topic_last_post_time >= tt.mark_time
! AND tt.user_id = {$user_id}
$sql_extra
ORDER BY t.topic_last_post_time DESC";
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
if ($row['topic_last_post_time'] == $row['mark_time'])
{
// Check if there're read topics for the forums having unread ones
! $read_topics_list[$row['topic_id']] = $row['mark_time'];
}
else
{
! $unread_topics_list[$row['topic_id']] = $row['mark_time'];
}
}
$db->sql_freeresult($result);
--- 4165,4185 ----
FROM ' . TOPICS_TABLE . ' t, ' . TOPICS_TRACK_TABLE . " tt
WHERE t.topic_id = tt.topic_id
AND t.topic_last_post_time >= tt.mark_time
! AND tt.user_id = $user_id
$sql_extra
ORDER BY t.topic_last_post_time DESC";
$result = $db->sql_query($sql);
+
while ($row = $db->sql_fetchrow($result))
{
if ($row['topic_last_post_time'] == $row['mark_time'])
{
// Check if there're read topics for the forums having unread ones
! $read_topics_list[$row['topic_id']] = (int) $row['mark_time'];
}
else
{
! $unread_topics_list[$row['topic_id']] = (int) $row['mark_time'];
}
}
$db->sql_freeresult($result);
***************
*** 4192,4204 ****
WHERE t.forum_id = ft.forum_id
AND t.topic_last_post_time > ft.mark_time
AND ' . $db->sql_in_set('t.topic_id', $tracked_topics_list, true, true) . "
! AND ft.user_id = {$user_id}
$sql_extra
ORDER BY t.topic_last_post_time DESC";
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
! $unread_topics_list[$row['topic_id']] = $row['mark_time'];
}
$db->sql_freeresult($result);
--- 4194,4207 ----
WHERE t.forum_id = ft.forum_id
AND t.topic_last_post_time > ft.mark_time
AND ' . $db->sql_in_set('t.topic_id', $tracked_topics_list, true, true) . "
! AND ft.user_id = $user_id
$sql_extra
ORDER BY t.topic_last_post_time DESC";
$result = $db->sql_query($sql);
+
while ($row = $db->sql_fetchrow($result))
{
! $unread_topics_list[$row['topic_id']] = (int) $row['mark_time'];
}
$db->sql_freeresult($result);
***************
*** 4208,4223 ****
// And the last step - find unread topics were not found before (that can mean a user has never read some forums)
$sql = 'SELECT topic_id
! FROM ' . TOPICS_TABLE . "
! WHERE topic_last_post_time > {$user->data['user_lastmark']}
! AND " . $db->sql_in_set('topic_id', $tracked_topics_list, true, true) . '
AND ' . $db->sql_in_set('forum_id', $tracked_forums_list, true, true) . "
$sql_extra
ORDER BY topic_last_post_time DESC";
$result = $db->sql_query_limit($sql, 1000);
while ($row = $db->sql_fetchrow($result))
{
! $unread_topics_list[$row['topic_id']] = $user->data['user_lastmark'];
}
$db->sql_freeresult($result);
}
--- 4211,4227 ----
// And the last step - find unread topics were not found before (that can mean a user has never read some forums)
$sql = 'SELECT topic_id
! FROM ' . TOPICS_TABLE . '
! WHERE topic_last_post_time > ' . (int) $user->data['user_lastmark'] . '
! AND ' . $db->sql_in_set('topic_id', $tracked_topics_list, true, true) . '
AND ' . $db->sql_in_set('forum_id', $tracked_forums_list, true, true) . "
$sql_extra
ORDER BY topic_last_post_time DESC";
$result = $db->sql_query_limit($sql, 1000);
+
while ($row = $db->sql_fetchrow($result))
{
! $unread_topics_list[$row['topic_id']] = (int) $user->data['user_lastmark'];
}
$db->sql_freeresult($result);
}
|
|
From: Ruslan U. <rx...@ph...> - 2009-07-28 14:34:32
|
Author: rxu
Date: Tue Jul 28 15:34:12 2009
New Revision: 9882
Log:
Fix r9855 for #46765
Authorised by: bantu
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 Jul 28 15:34:12 2009
***************
*** 4210,4216 ****
$sql = 'SELECT topic_id
FROM ' . TOPICS_TABLE . "
WHERE topic_last_post_time > {$user->data['user_lastmark']}
! AND " . $db->sql_in_set('topic_id', array_keys($unread_topics_list), true, true) . '
AND ' . $db->sql_in_set('forum_id', $tracked_forums_list, true, true) . "
$sql_extra
ORDER BY topic_last_post_time DESC";
--- 4210,4216 ----
$sql = 'SELECT topic_id
FROM ' . TOPICS_TABLE . "
WHERE topic_last_post_time > {$user->data['user_lastmark']}
! AND " . $db->sql_in_set('topic_id', $tracked_topics_list, true, true) . '
AND ' . $db->sql_in_set('forum_id', $tracked_forums_list, true, true) . "
$sql_extra
ORDER BY topic_last_post_time DESC";
|
|
From: Marek R. <ap...@ph...> - 2009-07-28 14:13:10
|
Author: aptx
Date: Tue Jul 28 15:12:34 2009
New Revision: 9881
Log:
- Use nonbreakable space.
Modified:
branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/common.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/common.php Tue Jul 28 15:12:34 2009
***************
*** 249,255 ****
'MANAGE' => 'Manage',
'MENU_TOGGLE' => 'Hide or display the side menu',
! 'MORE' => 'More »',
'MOVE_DOWN' => 'Move down',
'MOVE_UP' => 'Move up',
--- 249,255 ----
'MANAGE' => 'Manage',
'MENU_TOGGLE' => 'Hide or display the side menu',
! 'MORE' => 'More »',
'MOVE_DOWN' => 'Move down',
'MOVE_UP' => 'Move up',
|
Author: aptx
Date: Tue Jul 28 14:58:01 2009
New Revision: 9880
Log:
- Display version check on ACP main page.
- Cache version check.
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html
branches/phpBB-3_0_0/phpBB/adm/style/acp_update.html
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/acp/acp_main.php
branches/phpBB-3_0_0/phpBB/includes/acp/acp_update.php
branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_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 Jul 28 14:58:01 2009
***************
*** 14,19 ****
--- 14,35 ----
<p>{L_ADMIN_INTRO}</p>
+ <!-- IF S_VERSIONCHECK_FAIL -->
+ <div class="errorbox notice">
+ <p>{L_VERSIONCHECK_FAIL} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> - <a href="{U_VERSIONCHECK}">{L_MORE}</a></p>
+ </div>
+ <!-- ELSE -->
+ <!-- IF S_VERSION_UP_TO_DATE -->
+ <div class="successbox">
+ <p>{L_VERSION_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> - <a href="{U_VERSIONCHECK}">{L_MORE}</a></p>
+ </div>
+ <!-- ELSE -->
+ <div class="errorbox">
+ <p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> - <a href="{U_VERSIONCHECK}">{L_MORE}</a></p>
+ </div>
+ <!-- ENDIF -->
+ <!-- ENDIF -->
+
<!-- IF S_REMOVE_INSTALL -->
<div class="errorbox">
<h3>{L_WARNING}</h3>
Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_update.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_update.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_update.html Tue Jul 28 14:58:01 2009
***************
*** 10,20 ****
<!-- IF S_UP_TO_DATE and S_UP_TO_DATE_AUTO -->
<div class="successbox">
! <p>{L_VERSION_UP_TO_DATE_ACP}</p>
</div>
<!-- ELSE -->
<div class="errorbox">
! <p>{L_VERSION_NOT_UP_TO_DATE_ACP}</p>
</div>
<!-- ENDIF -->
--- 10,20 ----
<!-- IF S_UP_TO_DATE and S_UP_TO_DATE_AUTO -->
<div class="successbox">
! <p>{L_VERSION_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
</div>
<!-- ELSE -->
<div class="errorbox">
! <p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
</div>
<!-- ENDIF -->
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 Jul 28 14:58:01 2009
***************
*** 201,206 ****
--- 201,207 ----
<li>[Change] Add confirm-box when deleting permissions (Bug #13673 - Patch by nickvergessen)</li>
<li>[Change] Add pagination for icons and smilies in the ACP and smilies in the smiley popup</li>
<li>[Change] Cache get_username_string() function calls on viewtopic.</li>
+ <li>[Change] Cache version check.</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>
***************
*** 247,252 ****
--- 248,254 ----
<li>Show date of last reminder sent to user.</li>
</ul>
</li>
+ <li>[Feature] Display version check on ACP main page.</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_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 Jul 28 14:58:01 2009
***************
*** 395,400 ****
--- 395,419 ----
}
}
+ // Version check
+ $user->add_lang('install');
+
+ $latest_version_info = false;
+ if (($latest_version_info = obtain_latest_version_info(request_var('versioncheck_force', false))) === false)
+ {
+ $template->assign_var('S_VERSIONCHECK_FAIL', true);
+ }
+ else
+ {
+ $latest_version_info = explode("\n", $latest_version_info);
+ $latest_version = trim($latest_version_info[0]);
+ $template->assign_var('S_VERSION_UP_TO_DATE',
+ version_compare(
+ str_replace('rc', 'RC', strtolower($config['version'])),
+ str_replace('rc', 'RC', strtolower($latest_version)),
+ '<') ? false : true);
+ }
+
// Get forum statistics
$total_posts = $config['num_posts'];
$total_topics = $config['num_topics'];
***************
*** 492,497 ****
--- 511,518 ----
'U_ACTION' => $this->u_action,
'U_ADMIN_LOG' => append_sid("{$phpbb_admin_path}index.$phpEx", 'i=logs&mode=admin'),
'U_INACTIVE_USERS' => append_sid("{$phpbb_admin_path}index.$phpEx", 'i=inactive&mode=list'),
+ 'U_VERSIONCHECK' => append_sid("{$phpbb_admin_path}index.$phpEx", 'i=update&mode=version_check'),
+ 'U_VERSIONCHECK_FORCE' => append_sid("{$phpbb_admin_path}index.$phpEx", 'i=1&versioncheck_force=1'),
'S_ACTION_OPTIONS' => ($auth->acl_get('a_board')) ? true : false,
'S_FOUNDER' => ($user->data['user_type'] == USER_FOUNDER) ? true : false,
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_update.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_update.php Tue Jul 28 14:58:01 2009
***************
*** 37,48 ****
$errstr = '';
$errno = 0;
! $info = get_remote_file('www.phpbb.com', '/updatecheck', ((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno);
!
! if ($info === false)
! {
! trigger_error($errstr, E_USER_WARNING);
! }
$info = explode("\n", $info);
$latest_version = trim($info[0]);
--- 37,43 ----
$errstr = '';
$errno = 0;
! $info = obtain_latest_version_info(request_var('versioncheck_force', false), true);
$info = explode("\n", $info);
$latest_version = trim($info[0]);
***************
*** 68,73 ****
--- 63,69 ----
'S_UP_TO_DATE_AUTO' => $up_to_date_automatic,
'S_VERSION_CHECK' => true,
'U_ACTION' => $this->u_action,
+ 'U_VERSIONCHECK_FORCE' => append_sid($this->u_action . '&versioncheck_force=1'),
'LATEST_VERSION' => $latest_version,
'CURRENT_VERSION' => $config['version'],
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_admin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_admin.php Tue Jul 28 14:58:01 2009
***************
*** 3054,3057 ****
--- 3054,3096 ----
return true;
}
+ /**
+ * Obtains the latest version information
+ *
+ * @param bool $force_update Ignores cached data. Defaults to false.
+ * @param bool $warn_fail Trigger a warning if obtaining the latest version information fails. Defaults to false.
+ * @param int $ttl Cache version information for $ttl seconds. Defaults to 86400 (24 hours).
+ *
+ * @return string | false Version info on success, false on failure.
+ */
+ function obtain_latest_version_info($force_update = false, $warn_fail = false, $ttl = 86400)
+ {
+ global $cache;
+
+ $info = $cache->get('versioncheck');
+
+ if ($info === false || $force_update)
+ {
+ $errstr = '';
+ $errno = 0;
+
+ $info = get_remote_file('www.phpbb.com', '/updatecheck',
+ ((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno);
+
+ if ($info === false)
+ {
+ $cache->destroy('versioncheck');
+ if ($warn_fail)
+ {
+ trigger_error($errstr, E_USER_WARNING);
+ }
+ return false;
+ }
+
+ $cache->put('versioncheck', $info, $ttl);
+ }
+
+ return $info;
+ }
+
?>
\ No newline at end of file
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/common.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/common.php Tue Jul 28 14:58:01 2009
***************
*** 249,254 ****
--- 249,255 ----
'MANAGE' => 'Manage',
'MENU_TOGGLE' => 'Hide or display the side menu',
+ 'MORE' => 'More »',
'MOVE_DOWN' => 'Move down',
'MOVE_UP' => 'Move up',
***************
*** 374,382 ****
'UPLOAD_DIR_SIZE' => 'Size of posted attachments',
'USERS_PER_DAY' => 'Users per day',
! 'VALUE' => 'Value',
! 'VIEW_ADMIN_LOG' => 'View administrator log',
! 'VIEW_INACTIVE_USERS' => 'View inactive users',
'WELCOME_PHPBB' => 'Welcome to phpBB',
'WRITABLE_CONFIG' => 'Your config file (config.php) is currently world-writable. We strongly encourage you to change the permissions to 640 or at least to 644 (for example: <a href="http://en.wikipedia.org/wiki/Chmod" rel="external">chmod</a> 640 config.php).',
--- 375,385 ----
'UPLOAD_DIR_SIZE' => 'Size of posted attachments',
'USERS_PER_DAY' => 'Users per day',
! 'VALUE' => 'Value',
! 'VERSIONCHECK_FAIL' => 'Failed to obtain latest version',
! 'VERSIONCHECK_FORCE_UPDATE' => 'Re-Check version',
! 'VIEW_ADMIN_LOG' => 'View administrator log',
! 'VIEW_INACTIVE_USERS' => 'View inactive users',
'WELCOME_PHPBB' => 'Welcome to phpBB',
'WRITABLE_CONFIG' => 'Your config file (config.php) is currently world-writable. We strongly encourage you to change the permissions to 640 or at least to 644 (for example: <a href="http://en.wikipedia.org/wiki/Chmod" rel="external">chmod</a> 640 config.php).',
|
|
From: Ruslan U. <rx...@ph...> - 2009-07-28 11:48:23
|
Author: rxu
Date: Tue Jul 28 12:47:32 2009
New Revision: 9879
Log:
Fix bug #48345 - Adding users to group - default rank does not changing correctly
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/functions_user.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 Jul 28 12:47:32 2009
***************
*** 179,184 ****
--- 179,185 ----
<li>[Fix] Correctly propagate umlauts over search result pages (Bug #33755)</li>
<li>[Fix] Preserve post options when refusing to save the post as a draft. (Bug #39115)</li>
<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>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
<li>[Change] Template engine now permits to a limited extent variable includes.</li>
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_user.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_user.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_user.php Tue Jul 28 12:47:32 2009
***************
*** 2780,2786 ****
if ($default)
{
! group_set_user_default($group_id, $user_id_ary, $group_attributes);
}
$db->sql_transaction('commit');
--- 2780,2786 ----
if ($default)
{
! group_user_attributes('default', $group_id, $user_id_ary, false, $group_name, $group_attributes);
}
$db->sql_transaction('commit');
|
|
From: Henry S. <kel...@ph...> - 2009-07-28 11:27:08
|
Author: Kellanved
Date: Tue Jul 28 12:26:55 2009
New Revision: 9878
Log:
disable QR by default
Modified:
branches/phpBB-3_0_0/phpBB/install/database_update.php
branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql
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 Jul 28 12:26:55 2009
***************
*** 1409,1415 ****
if (!isset($config['allow_quick_reply']))
{
! set_config('allow_quick_reply', '1');
}
// Set every members user_options column to enable
--- 1409,1415 ----
if (!isset($config['allow_quick_reply']))
{
! set_config('allow_quick_reply', '0');
}
// Set every members user_options column to enable
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 Tue Jul 28 12:26:55 2009
***************
*** 27,33 ****
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_post_flash', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_post_links', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_privmsg', '1');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_quick_reply', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_bbcode', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_flash', '0');
--- 27,33 ----
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_post_flash', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_post_links', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_privmsg', '1');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_quick_reply', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_bbcode', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_flash', '0');
|
|
From: Henry S. <kel...@ph...> - 2009-07-28 07:06:06
|
Author: Kellanved
Date: Tue Jul 28 08:05:17 2009
New Revision: 9877
Log:
#48735
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 Tue Jul 28 08:05:17 2009
***************
*** 32,38 ****
class phpbb_captcha_qa
{
var $confirm_id;
- var $confirm_code;
var $answer;
var $question_ids;
var $question_text;
--- 32,37 ----
***************
*** 509,515 ****
$db->sql_query($sql);
// we leave the class usable by generating a new question
! $this->generate_code();
}
/**
--- 508,514 ----
$db->sql_query($sql);
// we leave the class usable by generating a new question
! $this->select_question();
}
/**
|
|
From: Meik S. <acy...@ph...> - 2009-07-27 15:06:20
|
Author: acydburn
Date: Mon Jul 27 16:05:59 2009
New Revision: 9876
Log:
Do not send private message back to sender if sender is in the same group the private message was sent to.
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/functions_privmsgs.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 Jul 27 16:05:59 2009
***************
*** 178,183 ****
--- 178,184 ----
<li>[Fix] Display "Locked" button instead of "Reply" one for locked forum in viewtopic (prosilver). (Bug #38055 - Patch by Raimon)</li>
<li>[Fix] Correctly propagate umlauts over search result pages (Bug #33755)</li>
<li>[Fix] Preserve post options when refusing to save the post as a draft. (Bug #39115)</li>
+ <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>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
<li>[Change] Template engine now permits to a limited extent variable includes.</li>
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_privmsgs.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_privmsgs.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_privmsgs.php Mon Jul 27 16:05:59 2009
***************
*** 1356,1361 ****
--- 1356,1367 ----
while ($row = $db->sql_fetchrow($result))
{
+ // Additionally, do not include the sender if he is in the group he wants to send to. ;)
+ if ($row['user_id'] === $user->data['user_id'])
+ {
+ continue;
+ }
+
$field = ($data['address_list']['g'][$row['group_id']] == 'to') ? 'to' : 'bcc';
$recipients[$row['user_id']] = $field;
}
***************
*** 1901,1907 ****
foreach ($pm_by_id as $message_id => $row)
{
$address[$message_id] = rebuild_header(array('to' => $row['to_address'], 'bcc' => $row['bcc_address']));
!
foreach ($_types as $ug_type)
{
if (isset($address[$message_id][$ug_type]) && sizeof($address[$message_id][$ug_type]))
--- 1907,1913 ----
foreach ($pm_by_id as $message_id => $row)
{
$address[$message_id] = rebuild_header(array('to' => $row['to_address'], 'bcc' => $row['bcc_address']));
!
foreach ($_types as $ug_type)
{
if (isset($address[$message_id][$ug_type]) && sizeof($address[$message_id][$ug_type]))
|
|
From: Henry S. <kel...@ph...> - 2009-07-27 13:41:07
|
Author: Kellanved
Date: Mon Jul 27 14:40:43 2009
New Revision: 9875
Log:
add EDIT_QUESTION
Modified:
branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php
Modified: branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php Mon Jul 27 14:40:43 2009
***************
*** 45,50 ****
--- 45,51 ----
'CONFIRM_QUESTION' => 'Question',
'ANSWER' => 'Answer',
+ 'EDIT_QUESTION' => 'Edit Question',
'QUESTIONS' => 'Questions',
'QUESTIONS_EXPLAIN' => 'Here you can add and edit questions to be asked on registration. You have to provide at least one question in the default board language to use this plugin. Questions should be easy for your target audience, but beyond the ability of google. Also, remember to change the questions regularly. If your question relies on punctuation, spelling or capitalisation, use the strict setting.',
'QUESTION_DELETED' => 'Question deleted',
|
|
From: Henry S. <kel...@ph...> - 2009-07-27 13:19:22
|
Author: Kellanved
Date: Mon Jul 27 14:19:06 2009
New Revision: 9874
Log:
typo
Modified:
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
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 Mon Jul 27 14:19:06 2009
***************
*** 156,162 ****
{
$hidden_fields = array();
! // this is required for postig.php - otherwise we would forget about the captcha being already solved
if ($this->solved)
{
$hidden_fields['confirm_code'] = $this->confirm_code;
--- 156,162 ----
{
$hidden_fields = array();
! // this is required for posting.php - otherwise we would forget about the captcha being already solved
if ($this->solved)
{
$hidden_fields['confirm_code'] = $this->confirm_code;
|
|
From: Chris S. <too...@ph...> - 2009-07-27 12:58:26
|
Author: toonarmy
Date: Mon Jul 27 13:58:15 2009
New Revision: 9873
Log:
Display the filter settings in the ACP log viewer when no entries are found.
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/acp_logs.html
Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_logs.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_logs.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_logs.html Mon Jul 27 13:58:15 2009
***************
*** 53,71 ****
</tbody>
</table>
- <fieldset class="display-options">
- {L_DISPLAY_LOG}: {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
- <input class="button2" type="submit" value="{L_GO}" name="sort" />
- {S_FORM_TOKEN}
- </fieldset>
- <hr />
-
<!-- IF PAGINATION -->
<div class="pagination">
<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span>
</div>
<!-- ENDIF -->
<!-- IF S_SHOW_FORUMS -->
<fieldset class="quick">
{L_SELECT_FORUM}: <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select>
--- 53,77 ----
</tbody>
</table>
<!-- IF PAGINATION -->
<div class="pagination">
<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span>
</div>
<!-- ENDIF -->
+ <!-- ELSE -->
+ <div class="errorbox">
+ <p>{L_NO_ENTRIES}</p>
+ </div>
+ <!-- ENDIF -->
+
+ <fieldset class="display-options">
+ {L_DISPLAY_LOG}: {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
+ <input class="button2" type="submit" value="{L_GO}" name="sort" />
+ {S_FORM_TOKEN}
+ </fieldset>
+ <hr />
+
<!-- IF S_SHOW_FORUMS -->
<fieldset class="quick">
{L_SELECT_FORUM}: <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select>
***************
*** 73,79 ****
</fieldset>
<!-- ENDIF -->
! <!-- IF S_CLEARLOGS -->
<fieldset class="quick">
<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />
<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" /><br />
--- 79,85 ----
</fieldset>
<!-- ENDIF -->
! <!-- IF .log and S_CLEARLOGS -->
<fieldset class="quick">
<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />
<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" /><br />
***************
*** 81,94 ****
</fieldset>
<!-- ENDIF -->
- <!-- ELSE -->
-
- <div class="errorbox">
- <p>{L_NO_ENTRIES}</p>
- </div>
-
- <!-- ENDIF -->
-
</form>
<!-- INCLUDE overall_footer.html -->
--- 87,92 ----
|
7 messages has been excluded from this view by a project administrator.
