mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

- removed unnecessary pm options

Browse Source 
- added one option to clearly define email visibility


git-svn-id: file:///svn/phpbb/trunk@5071 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2005-01-21 19:20:26 +00:00
parent 1438067953
commit e4be0ca799
13 changed files with 49 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/adm/admin_attachments.php
View File

@@ -1315,7 +1315,7 @@ function category_select($select_name, $group_id = FALSE)
$group_select .= '</select>';
return($group_select);
return $group_select;
}
// Extension group select
@@ -1396,7 +1396,7 @@ function download_select($select_name, $group_id = false)
$group_select .= '</select>';
return($group_select);
return $group_select;
}
// Upload already uploaded file... huh? are you kidding?

7
phpBB/adm/admin_board.php
View File

@@ -71,6 +71,7 @@ $display_vars = array(
'vars' => array(
'email_enable' => array('lang' => 'ENABLE_EMAIL', 'type' => 'radio:enabled_disabled', 'explain' => true),
'board_email_form' => array('lang' => 'BOARD_EMAIL_FORM', 'type' => 'radio:enabled_disabled', 'explain' => true),
'board_hide_emails' => array('lang' => 'BOARD_HIDE_EMAILS', 'type' => 'radio:enabled_disabled', 'explain' => true),
'email_function_name' => array('lang' => 'EMAIL_FUNCTION_NAME', 'type' => 'text:20:50', 'explain' => true),
'email_package_size' => array('lang' => 'EMAIL_PACKAGE_SIZE', 'type' => 'text:5:5', 'explain' => true),
'board_contact' => array('lang' => 'CONTACT_EMAIL', 'type' => 'text:25:100', 'explain' => true),
@@ -148,10 +149,7 @@ $display_vars = array(
'auth_smilies_pm' => array('lang' => 'ALLOW_SMILIES_PM', 'type' => 'radio:yes_no', 'explain' => false),
'allow_pm_attach' => array('lang' => 'ALLOW_PM_ATTACHMENTS', 'type' => 'radio:yes_no', 'explain' => false),
'auth_download_pm' => array('lang' => 'ALLOW_DOWNLOAD_PM', 'type' => 'radio:yes_no', 'explain' => false),
'allow_sig_pm' => array('lang' => 'ALLOW_SIG_PM', 'type' => 'radio:yes_no', 'explain' => false),
// 'enable_karma_pm' => array('lang' => 'ENABLE_KARMA_PM', 'type' => 'radio:yes_no', 'explain' => false),
'auth_report_pm' => array('lang' => 'ALLOW_REPORT_PM', 'type' => 'radio:yes_no', 'explain' => false),
'auth_quote_pm' => array('lang' => 'ALLOW_QUOTE_PM', 'type' => 'radio:yes_no', 'explain' => false),
'print_pm' => array('lang' => 'ALLOW_PRINT_PM', 'type' => 'radio:yes_no', 'explain' => false),
'email_pm' => array('lang' => 'ALLOW_EMAIL_PM', 'type' => 'radio:yes_no', 'explain' => false),
'forward_pm' => array('lang' => 'ALLOW_FORWARD_PM', 'type' => 'radio:yes_no', 'explain' => false),
@@ -512,5 +510,4 @@ function board_disable($value)
return '<input type="radio" name="config[board_disable]" value="1"' . $board_disable_yes . ' /> ' . $user->lang['YES'] . '&nbsp;&nbsp;<input type="radio" name="config[board_disable]" value="0"' . $board_disable_no . ' /> ' . $user->lang['NO'] . '<br /><input class="post" type="text" name="config[board_disable_msg]" maxlength="255" size="40" value="' . $new['board_disable_msg'] . '" />';
}
?>
?>

4
phpBB/adm/admin_database.php
View File

@@ -802,11 +802,11 @@ function get_table_def_mysql($table, $crlf)
if (get_magic_quotes_runtime())
{
return(stripslashes($schema_create));
return stripslashes($schema_create);
}
else
{
return($schema_create);
return $schema_create;
}
} // End get_table_def_mysql

14
phpBB/adm/pagestart.php
View File

@@ -153,9 +153,9 @@ function adm_page_footer($copyright_html = true)
exit;
}
function adm_page_message($title, $message, $show_header = false, $show_prev_info = true)
function adm_page_message($title, $message, $show_header = false)
{
global $phpEx, $SID, $user, $_SERVER, $_ENV;
global $phpEx, $SID, $user;
if ($show_header)
{
@@ -173,7 +173,6 @@ function adm_page_message($title, $message, $show_header = false, $show_prev_inf
}
$page = (!empty($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI'] : $_ENV['REQUEST_URI'];
?>
<br /><br />
@@ -183,14 +182,7 @@ function adm_page_message($title, $message, $show_header = false, $show_prev_inf
<th><?php echo $title; ?></th>
</tr>
<tr>
<td class="row1" align="center"><?php echo $message; ?>
<?php
if ($page && $show_prev_info)
{
echo '<br /><br />';
echo sprintf($user->lang['RETURN_PAGE'], '<a href="' . $page . '">', '</a>');
}
?> </td>
<td class="row1" align="center"><?php echo $message; ?></td>
</tr>
</table>