makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

some tiny fixes and two new features. ;)

Browse source 
git-svn-id: file:///svn/phpbb/trunk@7994 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-08-01 16:27:06 +00:00
parent 2ffdd92975
commit 5ed0be15ab
8 changed files with 38 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/adm/style/acp_ban.html
View file

@ -31,9 +31,9 @@
function display_details(option)
{
document.getElementById('acp_ban').unbangivereason.value = ban_give_reason[option];
document.getElementById('acp_ban').unbanreason.value = ban_reason[option];
document.getElementById('acp_ban').unbanlength.value = ban_length[option];
document.getElementById('acp_unban').unbangivereason.value = ban_give_reason[option];
document.getElementById('acp_unban').unbanreason.value = ban_reason[option];
document.getElementById('acp_unban').unbanlength.value = ban_length[option];
}
//-->

7
phpBB/docs/CHANGELOG.html
View file

@ -195,8 +195,11 @@ p a {
<li>[Fix] Multiple PM recipients not separated (Bug #13876)</li>
<li>[Change] Split the select list for the smilie order to clarify which are feasible and which are not (Bug #13911)</li>
<li>[Fix] Convert empty homepage fields (Bug #13917)</li>
<li>[Fix] Use board default DST setting on creating new profiles (Bug #11563)</li>
<li>[Feature] New constant PHPBB_EMBEDDED can be used to let phpBB not call exit; if wrapped/embedded (We may re-check this constant on other code locations later too)</li>
<li>[Feature] append_sid() having a check for the function append_sid_phpbb_hook(). This function is called in favor of append_sid() with the exact same parameters if present.</li>
<li>[Fix] Only list enabled modes within the dropdown at user administration (Bug #13883) - patch provided by damnian</li>
<li>[Fix] Properly display ban reason if selecting banned entries within the ACP (Bug #13896)</li>
</ul>

20
phpBB/includes/acp/acp_users.php
View file

@ -114,20 +114,26 @@ class acp_users
// Generate overall "header" for user admin
$s_form_options = '';
// Include info file...
include_once($phpbb_root_path . 'includes/acp/info/acp_users.' . $phpEx);
$forms_ary = acp_users_info::module();
// Build modes dropdown list
$sql = 'SELECT module_mode, module_auth
FROM ' . MODULES_TABLE . '
WHERE parent_id = ' . $this->p_master->p_parent . "
AND module_basename = 'users'
AND module_enabled = 1
ORDER BY left_id";
$result = $db->sql_query($sql);
foreach ($forms_ary['modes'] as $value => $ary)
while ($row = $db->sql_fetchrow($result))
{
if (!$this->p_master->module_auth($ary['auth']))
if (!$this->p_master->module_auth($row['module_auth']))
{
continue;
}
$selected = ($mode == $value) ? ' selected="selected"' : '';
$s_form_options .= '<option value="' . $value . '"' . $selected . '>' . $user->lang['ACP_USER_' . strtoupper($value)] . '</option>';
$selected = ($mode == $row['module_mode']) ? ' selected="selected"' : '';
$s_form_options .= '<option value="' . $row['module_mode'] . '"' . $selected . '>' . $user->lang['ACP_USER_' . strtoupper($row['module_mode'])] . '</option>';
}
$db->sql_freeresult($result);
$template->assign_vars(array(
'U_BACK' => $this->u_action,

12
phpBB/includes/functions.php
View file

@ -1582,6 +1582,13 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false)
{
global $_SID, $_EXTRA_URL;
// Developers using the hook function need to globalise the $_SID and $_EXTRA_URL on their own and also handle it appropiatly.
// They could mimick most of what is within this function
if (function_exists('append_sid_phpbb_hook'))
{
return append_sid_phpbb_hook($url, $params, $is_amp, $session_id);
}
// Assign sid if session id is not specified
if ($session_id === false)
{
@ -4276,7 +4283,10 @@ function page_footer($run_cron = true)
garbage_collection();
exit;
if (!defined('PHPBB_EMBEDDED'))
{
exit;
}
}
/**

2
phpBB/includes/functions_user.php
View file

@ -181,7 +181,7 @@ function user_add($user_row, $cp_data = false)
'user_lastpost_time' => 0,
'user_lastpage' => '',
'user_posts' => 0,
'user_dst' => 0,
'user_dst' => (int) $config['board_dst'],
'user_colour' => '',
'user_occ' => '',
'user_interests' => '',

2
phpBB/language/en/acp/board.php
View file

@ -353,7 +353,7 @@ $lang = array_merge($lang, array(
'BROWSER_VALID' => 'Validate browser',
'BROWSER_VALID_EXPLAIN' => 'Enables browser validation for each session improving security.',
'CHECK_DNSBL' => 'Check IP against DNS Blackhole List',
'CHECK_DNSBL_EXPLAIN' => 'If enabled the user’s IP address is checked against the following DNSBL services on registration and posting: <a href="http://spamcop.net">spamcop.net</a>, <a href="http://dsbl.org">dsbl.org</a> and <a href="http://spamhaus.org">spamhaus.org</a>. This lookup may take a while, depending on the server’s configuration. If slowdowns are experienced or too many false positives reported it is recommended to disable this check.',
'CHECK_DNSBL_EXPLAIN' => 'If enabled the user’s IP address is checked against the following DNSBL services on registration and posting: <a href="http://spamcop.net">spamcop.net</a>, <a href="http://dsbl.org">dsbl.org</a> and <a href="http://www.spamhaus.org">www.spamhaus.org</a>. This lookup may take a while, depending on the server’s configuration. If slowdowns are experienced or too many false positives reported it is recommended to disable this check.',
'CLASS_B' => 'A.B',
'CLASS_C' => 'A.B.C',
'EMAIL_CHECK_MX' => 'Check e-mail domain for valid MX record',

1
phpBB/posting.php
View file

@ -113,6 +113,7 @@ switch ($mode)
else
{
upload_popup();
garbage_collection();
exit;
}
break;

1
phpBB/styles/prosilver/template/editor.js
View file

@ -228,6 +228,7 @@ function addquote(post_id, username)
theSelection = theSelection.replace(/&lt\;/ig, '<');
theSelection = theSelection.replace(/&gt\;/ig, '>');
theSelection = theSelection.replace(/&amp\;/ig, '&');
theSelection = theSelection.replace(/&nbsp\;/ig, ' ');
}
else if (document.all)
{