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

Some attachment related changes to lang/layout

Browse source 
git-svn-id: file:///svn/phpbb/trunk@4651 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-11-06 13:08:37 +00:00
parent 3ccd55c089
commit 75ccd0e13c
2 changed files with 98 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

124
phpBB/adm/admin_board.php
View file

@ -35,6 +35,7 @@ require('pagestart.' . $phpEx);
// Get mode // Get mode
$mode = request_var('mode', ''); $mode = request_var('mode', '');
$action = request_var('action', '');
$submit = (isset($_POST['submit'])) ? true : false; $submit = (isset($_POST['submit'])) ? true : false;
// Check permissions/set title // Check permissions/set title
@ -109,6 +110,7 @@ while ($row = $db->sql_fetchrow($result))
$default_config[$config_name] = $config_value; $default_config[$config_name] = $config_value;
$new[$config_name] = request_var($config_name, $default_config[$config_name]); $new[$config_name] = request_var($config_name, $default_config[$config_name]);
if ($config_name == 'bump_interval' && $submit) if ($config_name == 'bump_interval' && $submit)
{ {
$new['bump_interval'] = request_var('bump_interval', 0) . request_var('bump_type', ''); $new['bump_interval'] = request_var('bump_interval', 0) . request_var('bump_type', '');
@ -195,23 +197,23 @@ adm_page_header($user->lang[$l_title]);
<p><?php echo $user->lang[$l_title . '_EXPLAIN']; ?></p> <p><?php echo $user->lang[$l_title . '_EXPLAIN']; ?></p>
<?php
if (sizeof($error))
{
?>
<h2 style="color:red"><?php echo $user->lang['WARNING']; ?></h2>
<p><?php echo implode('<br />', $error); ?></p>
<?php
}
?>
<form action="<?php echo "admin_board.$phpEx$SID&amp;mode=$mode"; ?>" method="post"><table class="bg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center"> <form action="<?php echo "admin_board.$phpEx$SID&amp;mode=$mode"; ?>" method="post"><table class="bg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
<tr> <tr>
<th colspan="2"><?php echo $user->lang[$l_title]; ?></th> <th colspan="2"><?php echo $user->lang[$l_title]; ?></th>
</tr> </tr>
<?php <?php
if (sizeof($error))
{
?>
<tr>
<td class="row3" colspan="2" align="center"><span style="color:red"><?php echo implode('<br />', $error); ?></span></td>
</tr>
<?php
}
// Output relevant page // Output relevant page
switch ($mode) switch ($mode)
{ {
@ -219,7 +221,7 @@ switch ($mode)
include($phpbb_root_path . 'includes/functions_posting.' . $phpEx); include($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
if (isset($_POST['search_imagick'])) if ($action == 'imgmagick')
{ {
$new['img_imagick'] = search_imagemagick(); $new['img_imagick'] = search_imagemagick();
} }
@ -253,89 +255,82 @@ switch ($mode)
?> ?>
<tr> <tr>
<td class="row1" width="50%"><b><?php echo $user->lang['UPLOAD_DIR']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['UPLOAD_DIR_EXPLAIN']; ?></span></td> <td class="row1" width="40%"><b><?php echo $user->lang['UPLOAD_DIR']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['UPLOAD_DIR_EXPLAIN']; ?></span></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="upload_dir" class="post" value="<?php echo $new['upload_dir'] ?>" /></td> <td class="row2"><input type="text" size="25" maxlength="100" name="upload_dir" class="post" value="<?php echo $new['upload_dir'] ?>" /></td>
</tr> </tr>
<tr> <tr>
<td class="row1" width="50%"><b><?php echo $user->lang['DISPLAY_ORDER']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['DISPLAY_ORDER_EXPLAIN']; ?></span></td> <td class="row1"><b><?php echo $user->lang['DISPLAY_ORDER']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['DISPLAY_ORDER_EXPLAIN']; ?></span></td>
<td class="row2"> <td class="row2"><input type="radio" name="display_order" value="0" <?php echo $display_order_no; ?> /> <?php echo $user->lang['DESCENDING']; ?> &nbsp; <input type="radio" name="display_order" value="1" <?php echo $display_order_yes; ?> /> <?php echo $user->lang['ASCENDING']; ?></td>
<table border=0 cellpadding=0 cellspacing=0>
<tr>
<td><input type="radio" name="display_order" value="0" <?php echo $display_order_no; ?> /> <?php echo $user->lang['DESCENDING']; ?></td>
</tr> </tr>
<tr> <tr>
<td><input type="radio" name="display_order" value="1" <?php echo $display_order_yes; ?> /> <?php echo $user->lang['ASCENDING']; ?></td> <td class="row1"><b><?php echo $user->lang['ATTACH_QUOTA']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['ATTACH_QUOTA_EXPLAIN']; ?></span></td>
</tr>
</table></td>
</tr>
<tr>
<td class="row1" width="50%"><b><?php echo $user->lang['ATTACH_MAX_FILESIZE']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['ATTACH_MAX_FILESIZE_EXPLAIN']; ?></span></td>
<td class="row2"><input type="text" size="8" maxlength="15" name="max_filesize" class="post" value="<?php echo $new['max_filesize']; ?>" /> <?php echo $select_size_mode; ?></td>
</tr>
<tr>
<td class="row1" width="50%"><b><?php echo $user->lang['ATTACH_QUOTA']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['ATTACH_QUOTA_EXPLAIN']; ?></span></td>
<td class="row2"><input type="text" size="8" maxlength="15" name="attachment_quota" class="post" value="<?php echo $new['attachment_quota']; ?>" /> <?php echo $select_quota_size_mode; ?></td> <td class="row2"><input type="text" size="8" maxlength="15" name="attachment_quota" class="post" value="<?php echo $new['attachment_quota']; ?>" /> <?php echo $select_quota_size_mode; ?></td>
</tr> </tr>
<tr> <tr>
<td class="row1" width="50%"><b><?php echo $user->lang['ATTACH_MAX_PM_FILESIZE']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['ATTACH_MAX_PM_FILESIZE_EXPLAIN']; ?></span></td> <td class="row1"><b><?php echo $user->lang['ATTACH_MAX_FILESIZE']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['ATTACH_MAX_FILESIZE_EXPLAIN']; ?></span></td>
<td class="row2"><input type="text" size="8" maxlength="15" name="max_filesize" class="post" value="<?php echo $new['max_filesize']; ?>" /> <?php echo $select_size_mode; ?></td>
</tr>
<tr>
<td class="row1"><b><?php echo $user->lang['ATTACH_MAX_PM_FILESIZE']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['ATTACH_MAX_PM_FILESIZE_EXPLAIN']; ?></span></td>
<td class="row2"><input type="text" size="8" maxlength="15" name="max_filesize_pm" class="post" value="<?php echo $new['max_filesize_pm']; ?>" /> <?php echo $select_pm_size_mode; ?></td> <td class="row2"><input type="text" size="8" maxlength="15" name="max_filesize_pm" class="post" value="<?php echo $new['max_filesize_pm']; ?>" /> <?php echo $select_pm_size_mode; ?></td>
</tr> </tr>
<tr> <tr>
<td class="row1" width="50%"><b><?php echo $user->lang['MAX_ATTACHMENTS'] ?>: </b></td> <td class="row1"><b><?php echo $user->lang['MAX_ATTACHMENTS'] ?>: </b></td>
<td class="row2"><input type="text" size="3" maxlength="3" name="max_attachments" class="post" value="<?php echo $new['max_attachments']; ?>" /></td> <td class="row2"><input type="text" size="3" maxlength="3" name="max_attachments" class="post" value="<?php echo $new['max_attachments']; ?>" /></td>
</tr> </tr>
<tr> <tr>
<td class="row1" width="50%"><b><?php echo $user->lang['MAX_ATTACHMENTS_PM'] ?>: </b></td> <td class="row1"><b><?php echo $user->lang['MAX_ATTACHMENTS_PM'] ?>: </b></td>
<td class="row2"><input type="text" size="3" maxlength="3" name="max_attachments_pm" class="post" value="<?php echo $new['max_attachments_pm']; ?>" /></td> <td class="row2"><input type="text" size="3" maxlength="3" name="max_attachments_pm" class="post" value="<?php echo $new['max_attachments_pm']; ?>" /></td>
</tr> </tr>
<tr>
<td class="spacer" colspan="2" height="1"><img src="../images/spacer.gif" alt="" width="1" height="1" /></td>
</tr>
<tr> <tr>
<th align="center" colspan="2"><?php echo $user->lang['SETTINGS_CAT_IMAGES']; ?></th> <th align="center" colspan="2"><?php echo $user->lang['SETTINGS_CAT_IMAGES']; ?></th>
</tr> </tr>
<tr> <tr>
<td align="center" colspan="2" class="row3"><?php echo $user->lang['ASSIGNED_GROUP']; ?>: <?php echo ( (count($s_assigned_groups[IMAGE_CAT])) ? implode(', ', $s_assigned_groups[IMAGE_CAT]) : $user->lang['NONE']); ?></td> <td class="row3" colspan="2" align="center"><?php echo $user->lang['ASSIGNED_GROUP']; ?>: <?php echo ( (count($s_assigned_groups[IMAGE_CAT])) ? implode(', ', $s_assigned_groups[IMAGE_CAT]) : $user->lang['NONE']); ?></td>
</tr> </tr>
<tr> <tr>
<td class="row1" width="50%"><?php echo $user->lang['DISPLAY_INLINED']; ?>:<br /><span class="gensmall"><?php echo $user->lang['DISPLAY_INLINED_EXPLAIN']; ?></span></td> <td class="row1"><b><?php echo $user->lang['DISPLAY_INLINED']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['DISPLAY_INLINED_EXPLAIN']; ?></span></td>
<td class="row2"><input type="radio" name="img_display_inlined" value="1" <?php echo $display_inlined_yes ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="img_display_inlined" value="0" <?php echo $display_inlined_no ?> /> <?php echo $user->lang['NO']; ?></td> <td class="row2"><input type="radio" name="img_display_inlined" value="1" <?php echo $display_inlined_yes ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="img_display_inlined" value="0" <?php echo $display_inlined_no ?> /> <?php echo $user->lang['NO']; ?></td>
</tr> </tr>
<?php <?php
// Check Thumbnail Support // Check Thumbnail Support
if ($new['img_imagick'] == '' && !count(get_supported_image_types())) if (!$new['img_imagick'] && !count(get_supported_image_types()))
{ {
$new['img_create_thumbnail'] = '0'; $new['img_create_thumbnail'] = '0';
} }
else else
{ {
?> ?>
<tr> <tr>
<td class="row1" width="50%"><?php echo $user->lang['CREATE_THUMBNAIL']; ?>:<br /><span class="gensmall"><?php echo $user->lang['CREATE_THUMBNAIL_EXPLAIN']; ?></span></td> <td class="row1"><b><?php echo $user->lang['CREATE_THUMBNAIL']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['CREATE_THUMBNAIL_EXPLAIN']; ?></span></td>
<td class="row2"><input type="radio" name="img_create_thumbnail" value="1" <?php echo $create_thumbnail_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="img_create_thumbnail" value="0" <?php echo $create_thumbnail_no; ?> /> <?php echo $user->lang['NO']; ?></td> <td class="row2"><input type="radio" name="img_create_thumbnail" value="1" <?php echo $create_thumbnail_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="img_create_thumbnail" value="0" <?php echo $create_thumbnail_no; ?> /> <?php echo $user->lang['NO']; ?></td>
</tr> </tr>
<tr> <tr>
<td class="row1" width="50%"><?php echo $user->lang['MIN_THUMB_FILESIZE']; ?>:<br /><span class="gensmall"><?php echo $user->lang['MIN_THUMB_FILESIZE_EXPLAIN']; ?></span></td> <td class="row1"><b><?php echo $user->lang['MIN_THUMB_FILESIZE']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['MIN_THUMB_FILESIZE_EXPLAIN']; ?></span></td>
<td class="row2"><input type="text" size="7" maxlength="15" name="img_min_thumb_filesize" value="<?php echo $new['img_min_thumb_filesize']; ?>" class="post" /> <?php echo $user->lang['BYTES']; ?></td> <td class="row2"><input type="text" size="7" maxlength="15" name="img_min_thumb_filesize" value="<?php echo $new['img_min_thumb_filesize']; ?>" class="post" /> <?php echo $user->lang['BYTES']; ?></td>
</tr> </tr>
<?php <?php
} }
?> ?>
<tr> <tr>
<td class="row1" width="50%"><?php echo $user->lang['IMAGICK_PATH']; ?>:<br /><span class="gensmall"><?php echo $user->lang['IMAGICK_PATH_EXPLAIN']; ?></span></td> <td class="row1"><b><?php echo $user->lang['IMAGICK_PATH']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['IMAGICK_PATH_EXPLAIN']; ?></span></td>
<td class="row2"><input type="text" size="20" maxlength="200" name="img_imagick" value="<?php echo $new['img_imagick']; ?>" class="post" /></td> <td class="row2"><input type="text" size="20" maxlength="200" name="img_imagick" value="<?php echo $new['img_imagick']; ?>" class="post" />&nbsp;&nbsp;<span class="gensmall">[ <a href="<?php echo "admin_board.$phpEx$SID&amp;mode=$mode&amp;action=imgmagick"; ?>"><?php echo $user->lang['SEARCH_IMAGICK']; ?></a> ]</span></td>
</tr> </tr>
<tr> <tr>
<td class="row1" width="50%"><?php echo $user->lang['MAX_IMAGE_SIZE']; ?>:<br /><span class="gensmall"><?php echo $user->lang['MAX_IMAGE_SIZE_EXPLAIN']; ?></span></td> <td class="row1"><b><?php echo $user->lang['MAX_IMAGE_SIZE']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['MAX_IMAGE_SIZE_EXPLAIN']; ?></span></td>
<td class="row2"><input type="text" size="3" maxlength="4" name="img_max_width" value="<?php echo $new['img_max_width']; ?>" class="post" /> x <input type="text" size="3" maxlength="4" name="img_max_height" value="<?php echo $new['img_max_height']; ?>" class="post" /></td> <td class="row2"><input type="text" size="3" maxlength="4" name="img_max_width" value="<?php echo $new['img_max_width']; ?>" class="post" /> px X <input type="text" size="3" maxlength="4" name="img_max_height" value="<?php echo $new['img_max_height']; ?>" class="post" /> px</td>
</tr> </tr>
<tr> <tr>
<td class="row1" width="50%"><?php echo $user->lang['IMAGE_LINK_SIZE']; ?>:<br /><span class="gensmall"><?php echo $user->lang['IMAGE_LINK_SIZE_EXPLAIN']; ?></span></td> <td class="row1"><b><?php echo $user->lang['IMAGE_LINK_SIZE']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['IMAGE_LINK_SIZE_EXPLAIN']; ?></span></td>
<td class="row2"><input type="text" size="3" maxlength="4" name="img_link_width" value="<?php echo $new['img_link_width']; ?>" class="post" /> x <input type="text" size="3" maxlength="4" name="img_link_height" value="<?php echo $new['img_link_height']; ?>" class="post" /></td> <td class="row2"><input type="text" size="3" maxlength="4" name="img_link_width" value="<?php echo $new['img_link_width']; ?>" class="post" /> px X <input type="text" size="3" maxlength="4" name="img_link_height" value="<?php echo $new['img_link_height']; ?>" class="post" /> px</td>
</tr> </tr>
<?php <?php
break; break;
case 'cookie': case 'cookie':
@ -345,7 +340,7 @@ switch ($mode)
?> ?>
<tr> <tr>
<td class="row1" width="50%"><b><?php echo $user->lang['COOKIE_DOMAIN']; ?>: </b></td> <td class="row1"><b><?php echo $user->lang['COOKIE_DOMAIN']; ?>: </b></td>
<td class="row2"><input class="post" type="text" maxlength="255" name="cookie_domain" value="<?php echo $new['cookie_domain']; ?>" /></td> <td class="row2"><input class="post" type="text" maxlength="255" name="cookie_domain" value="<?php echo $new['cookie_domain']; ?>" /></td>
</tr> </tr>
<tr> <tr>
@ -375,7 +370,7 @@ switch ($mode)
?> ?>
<tr> <tr>
<td class="row1" width="50%"><b><?php echo $user->lang['ALLOW_LOCAL']; ?>: </b></td> <td class="row1"><b><?php echo $user->lang['ALLOW_LOCAL']; ?>: </b></td>
<td class="row2"><input type="radio" name="allow_avatar_local" value="1"<?php echo $avatars_local_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="allow_avatar_local" value="0"<?php echo $avatars_local_no; ?> /> <?php echo $user->lang['NO']; ?></td> <td class="row2"><input type="radio" name="allow_avatar_local" value="1"<?php echo $avatars_local_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="allow_avatar_local" value="0"<?php echo $avatars_local_no; ?> /> <?php echo $user->lang['NO']; ?></td>
</tr> </tr>
<tr> <tr>
@ -437,7 +432,7 @@ switch ($mode)
?> ?>
<tr> <tr>
<td class="row1" width="50%"><b><?php echo $user->lang['DEFAULT_STYLE']; ?></td> <td class="row1"><b><?php echo $user->lang['DEFAULT_STYLE']; ?></td>
<td class="row2"><select name="default_style"><?php echo $style_select; ?></select></td> <td class="row2"><select name="default_style"><?php echo $style_select; ?></select></td>
</tr> </tr>
<tr> <tr>
@ -505,7 +500,7 @@ switch ($mode)
<td class="row2"><input type="radio" name="allow_attachments" value="1" <?php echo $attachments_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="allow_attachments" value="0" <?php echo $attachments_no; ?> /> <?php echo $user->lang['NO']; ?></td> <td class="row2"><input type="radio" name="allow_attachments" value="1" <?php echo $attachments_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="allow_attachments" value="0" <?php echo $attachments_no; ?> /> <?php echo $user->lang['NO']; ?></td>
</tr> </tr>
<tr> <tr>
<td class="row1" width="50%"><b><?php echo $user->lang['ALLOW_PM_ATTACHMENTS']; ?>: </b></td> <td class="row1"><b><?php echo $user->lang['ALLOW_PM_ATTACHMENTS']; ?>: </b></td>
<td class="row2"><input type="radio" name="allow_pm_attach" value="1" <?php echo $pm_attach_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="allow_pm_attach" value="0" <?php echo $pm_attach_no; ?> /> <?php echo $user->lang['NO']; ?></td> <td class="row2"><input type="radio" name="allow_pm_attach" value="1" <?php echo $pm_attach_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="allow_pm_attach" value="0" <?php echo $pm_attach_no; ?> /> <?php echo $user->lang['NO']; ?></td>
</tr> </tr>
<tr> <tr>
@ -578,7 +573,7 @@ switch ($mode)
} }
?> ?>
<tr> <tr>
<td class="row1" width="50%"><b><?php echo $user->lang['SITE_NAME']; ?>: </b></td> <td class="row1"><b><?php echo $user->lang['SITE_NAME']; ?>: </b></td>
<td class="row2"><input class="post" type="text" size="40" maxlength="255" name="sitename" value="<?php echo htmlentities($new['sitename']); ?>" /></td> <td class="row2"><input class="post" type="text" size="40" maxlength="255" name="sitename" value="<?php echo htmlentities($new['sitename']); ?>" /></td>
</tr> </tr>
<tr> <tr>
@ -682,15 +677,15 @@ switch ($mode)
<td class="row2"><input type="radio" name="board_email_form" value="1" <?php echo $board_email_form_yes; ?> /> <?php echo $user->lang['ENABLED']; ?>&nbsp;&nbsp;<input type="radio" name="board_email_form" value="0" <?php echo $board_email_form_no; ?> /> <?php echo $user->lang['DISABLED']; ?></td> <td class="row2"><input type="radio" name="board_email_form" value="1" <?php echo $board_email_form_yes; ?> /> <?php echo $user->lang['ENABLED']; ?>&nbsp;&nbsp;<input type="radio" name="board_email_form" value="0" <?php echo $board_email_form_no; ?> /> <?php echo $user->lang['DISABLED']; ?></td>
</tr> </tr>
<tr> <tr>
<td class="row1" width="50%"><b><?php echo $user->lang['EMAIL_PACKAGE_SIZE']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['EMAIL_PACKAGE_SIZE_EXPLAIN']; ?></span></td> <td class="row1"><b><?php echo $user->lang['EMAIL_PACKAGE_SIZE']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['EMAIL_PACKAGE_SIZE_EXPLAIN']; ?></span></td>
<td class="row2"><input class="post" type="text" size="5" maxlength="5" name="email_package_size" value="<?php echo $new['email_package_size']; ?>" /></td> <td class="row2"><input class="post" type="text" size="5" maxlength="5" name="email_package_size" value="<?php echo $new['email_package_size']; ?>" /></td>
</tr> </tr>
<tr> <tr>
<td class="row1" width="50%"><b><?php echo $user->lang['CONTACT_EMAIL']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['CONTACT_EMAIL_EXPLAIN']; ?></span></td> <td class="row1"><b><?php echo $user->lang['CONTACT_EMAIL']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['CONTACT_EMAIL_EXPLAIN']; ?></span></td>
<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="board_contact" value="<?php echo $new['board_contact']; ?>" /></td> <td class="row2"><input class="post" type="text" size="25" maxlength="100" name="board_contact" value="<?php echo $new['board_contact']; ?>" /></td>
</tr> </tr>
<tr> <tr>
<td class="row1" width="50%"><b><?php echo $user->lang['ADMIN_EMAIL']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['ADMIN_EMAIL_EXPLAIN']; ?></span></td> <td class="row1"><b><?php echo $user->lang['ADMIN_EMAIL']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['ADMIN_EMAIL_EXPLAIN']; ?></span></td>
<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="board_email" value="<?php echo $new['board_email']; ?>" /></td> <td class="row2"><input class="post" type="text" size="25" maxlength="100" name="board_email" value="<?php echo $new['board_email']; ?>" /></td>
</tr> </tr>
<tr> <tr>
@ -809,7 +804,7 @@ switch ($mode)
?> ?>
<tr> <tr>
<td class="row1" width="50%"><b><?php echo $user->lang['LIMIT_LOAD']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['LIMIT_LOAD_EXPLAIN']; ?></span></td> <td class="row1"><b><?php echo $user->lang['LIMIT_LOAD']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['LIMIT_LOAD_EXPLAIN']; ?></span></td>
<td class="row2"><input class="post" type="text" size="4" maxlength="4" name="limit_load" value="<?php echo $new['limit_load']; ?>" /></td> <td class="row2"><input class="post" type="text" size="4" maxlength="4" name="limit_load" value="<?php echo $new['limit_load']; ?>" /></td>
</tr> </tr>
<tr> <tr>
@ -908,7 +903,7 @@ switch ($mode)
?> ?>
<tr> <tr>
<td class="row1" width="50%"><b><?php echo $user->lang['AUTH_METHOD']; ?>: </b></td> <td class="row1"><b><?php echo $user->lang['AUTH_METHOD']; ?>: </b></td>
<td class="row2"><select name="auth_method"><?php echo $auth_select; ?></select></td> <td class="row2"><select name="auth_method"><?php echo $auth_select; ?></select></td>
</tr> </tr>
<?php <?php
@ -978,7 +973,7 @@ switch ($mode)
?> ?>
<tr> <tr>
<td class="cat" colspan="2" align="center"><input type="submit" name="submit" value="<?php echo $user->lang['SUBMIT']; ?>" class="btnmain" />&nbsp;&nbsp;<?php echo ($mode == 'attach') ? '<input type="submit" name="search_imagick" value="' . $user->lang['SEARCH_IMAGICK'] . '" class="btnlite" />&nbsp;&nbsp;' : ''; ?><input type="reset" value="<?php echo $user->lang['RESET']; ?>" class="btnlite" /></td> <td class="cat" colspan="2" align="center"><input type="submit" name="submit" value="<?php echo $user->lang['SUBMIT']; ?>" class="btnmain" />&nbsp;&nbsp;<input type="reset" value="<?php echo $user->lang['RESET']; ?>" class="btnlite" /></td>
</tr> </tr>
</table></form> </table></form>
@ -1001,7 +996,7 @@ function search_imagemagick()
foreach ($locations as $location) foreach ($locations as $location)
{ {
if (file_exists($location . 'convert' . $exe) && is_executable($location . 'convert' . $exe)) if (file_exists($location . 'convert' . $exe) && @is_readable($location . 'convert' . $exe) && @filesize($location . 'convert' . $exe) > 80000)
{ {
$imagick = str_replace('\\', '/', $location); $imagick = str_replace('\\', '/', $location);
continue; continue;
@ -1030,24 +1025,27 @@ function test_upload(&$error, $upload_dir, $create_directory = false)
{ {
if (!file_exists($upload_dir)) if (!file_exists($upload_dir))
{ {
@mkdir($upload_dir, 0755); @mkdir($upload_dir, 0777);
@chmod($upload_dir, 0777); @chmod($upload_dir, 0777);
} }
} }
if (!file_exists($upload_dir)) if (!file_exists($upload_dir))
{ {
$error[] = sprintf($user->lang['DIRECTORY_DOES_NOT_EXIST'], $real_upload_dir); $error[] = sprintf($user->lang['NO_UPLOAD_DIR'], $real_upload_dir);
return;
} }
if (!count($error) && !is_dir($upload_dir)) if (!is_dir($upload_dir))
{ {
$error[] = sprintf($user->lang['DIRECTORY_IS_NOT_A_DIR'], $real_upload_dir); $error[] = sprintf($user->lang['UPLOAD_NOT_DIR'], $real_upload_dir);
return;
} }
if (!count($error) && !is_writable($upload_dir)) if (!is_writable($upload_dir))
{ {
$error[] = sprintf($user->lang['DIRECTORY_NOT_WRITEABLE'], $real_upload_dir); $error[] = sprintf($user->lang['NO_WRITE_UPLOAD'], $real_upload_dir);
return;
} }
} }

58
phpBB/language/en/lang_admin.php
View file

@ -53,6 +53,10 @@ $lang += array(
'MOD_LOGS' => 'Moderator Log', 'MOD_LOGS' => 'Moderator Log',
'CRITICAL_LOGS' => 'Error Log', 'CRITICAL_LOGS' => 'Error Log',
'PERM_CAT' => 'Permissions',
'USER_PERMS' => 'User permissions',
'GROUP_PERMS' => 'Group permissions',
'POST_CAT' => 'Posting', 'POST_CAT' => 'Posting',
'SMILE' => 'Smilies', 'SMILE' => 'Smilies',
'ICONS' => 'Icons', 'ICONS' => 'Icons',
@ -70,12 +74,10 @@ $lang += array(
'BAN_IPS' => 'Ban IPs', 'BAN_IPS' => 'Ban IPs',
'BAN_USERS' => 'Ban Usernames', 'BAN_USERS' => 'Ban Usernames',
'DISALLOW' => 'Disallow names', 'DISALLOW' => 'Disallow names',
'RANKS' => 'Manage Ranks', 'RANKS' => 'Ranks',
'PRUNE_USERS' => 'Prune users', 'PRUNE_USERS' => 'Prune users',
'BOTS' => 'Manage Bots', 'BOTS' => 'Manage Bots',
'GROUP_MANAGE' => 'Manage groups', 'GROUP_MANAGE' => 'Manage groups',
'USER_PERMS' => 'User permissions',
'GROUP_PERMS' => 'Group permissions',
'ADMINISTRATORS' => 'Administrators', 'ADMINISTRATORS' => 'Administrators',
'USERNAMES_EXPLAIN' => 'Place each username on a seperate line', 'USERNAMES_EXPLAIN' => 'Place each username on a seperate line',
@ -1615,39 +1617,39 @@ $lang += array(
$lang += array( $lang += array(
'ATTACHMENT_SETTINGS' => 'Attachment Settings', 'ATTACHMENT_SETTINGS' => 'Attachment Settings',
'ATTACHMENT_SETTINGS_EXPLAIN' => 'Here you can configure the Main Settings for Attachments and the associated Special Categories.', 'ATTACHMENT_SETTINGS_EXPLAIN' => 'Here you can configure the Main Settings for Attachments and the associated Special Categories.',
'UPLOAD_DIR' => 'Upload Directory', 'UPLOAD_DIR' => 'Upload Directory',
'UPLOAD_DIR_EXPLAIN' => 'Storage Path for Attachments.', 'UPLOAD_DIR_EXPLAIN' => 'Storage Path for Attachments.',
'DISPLAY_ORDER' => 'Attachment Display Order', 'DISPLAY_ORDER' => 'Attachment Display Order',
'DISPLAY_ORDER_EXPLAIN' => 'Whether to display Attachments in Posts/PMs in Descending Filetime Order (Newest Attachment First) or Ascending Filetime Order (Oldest Attachment First).', 'DISPLAY_ORDER_EXPLAIN' => 'Display attachments ordering by time.',
'ATTACH_MAX_FILESIZE' => 'Filesize', 'ATTACH_MAX_FILESIZE' => 'Maximum filesize',
'ATTACH_MAX_FILESIZE_EXPLAIN' => 'Maximum filesize allowed for one file. A value of 0 means \'unlimited\'.', 'ATTACH_MAX_FILESIZE_EXPLAIN' => 'Maximum size of each file, 0 is unlimited.',
'ATTACH_QUOTA' => 'Attachment Quota', 'ATTACH_QUOTA' => 'Total attachment quota',
'ATTACH_QUOTA_EXPLAIN' => 'Maximum Disk Space ALL Attachments can hold on your Webspace. A value of 0 means \'unlimited\'.', 'ATTACH_QUOTA_EXPLAIN' => 'Maximum drive space available for attachments in total, 0 is unlimited.',
'ATTACH_MAX_PM_FILESIZE' => 'Maximum Filesize in Private Messages Folder', 'ATTACH_MAX_PM_FILESIZE' => 'Maximum filesize messaging',
'ATTACH_MAX_PM_FILESIZE_EXPLAIN' => 'Maximum Disk Space Attachments can use up in each User\'s Private Message box. A value of 0 means \'unlimited\'.', 'ATTACH_MAX_PM_FILESIZE_EXPLAIN' => 'Maximum drive space available per user for private message attachments, 0 is unlimited.',
'MAX_ATTACHMENTS' => 'Maximum Number of Attachments for one post', 'MAX_ATTACHMENTS' => 'Max attachments per post',
'MAX_ATTACHMENTS_PM' => 'Maximum Number of Attachments for one Private Message', 'MAX_ATTACHMENTS_PM' => 'Max attachments per message',
'SETTINGS_CAT_IMAGES' => 'Settings for Special Category: Images', 'SETTINGS_CAT_IMAGES' => 'Image category settings',
'ASSIGNED_GROUP' => 'Assigned Group', 'ASSIGNED_GROUP' => 'Assigned Group',
'DISPLAY_INLINED' => 'Display Images Inlined', 'DISPLAY_INLINED' => 'Display images inline',
'DISPLAY_INLINED_EXPLAIN' => 'Choose whether to display images directly within the post (yes) or to display images as a link.', 'DISPLAY_INLINED_EXPLAIN' => 'If set to No image attachments will show as a link.',
'CREATE_THUMBNAIL' => 'Create Thumbnail', 'CREATE_THUMBNAIL' => 'Create thumbnail',
'CREATE_THUMBNAIL_EXPLAIN' => 'Always create a Thumbnail. This feature overrides nearly all Settings within this Special Category, except of the Maximum Image Dimensions.', 'CREATE_THUMBNAIL_EXPLAIN' => 'Create a thumbnail in all possible situations.',
'MIN_THUMB_FILESIZE' => 'Minimum Thumbnail Filesize', 'MIN_THUMB_FILESIZE' => 'Minimum thumbnail filesize',
'MIN_THUMB_FILESIZE_EXPLAIN' => 'If an Image is smaller than this defined Filesize no Thumbnail will be created.', 'MIN_THUMB_FILESIZE_EXPLAIN' => 'Do not create a thumbnail for images smaller than this.',
'IMAGICK_PATH' => 'Imagick Program (Complete Path)', 'IMAGICK_PATH' => 'Imagemagick path',
'IMAGICK_PATH_EXPLAIN' => 'Enter the Path to the convert program of imagick, normally /usr/bin/convert (on windows: c:/imagemagick/convert.exe).', 'IMAGICK_PATH_EXPLAIN' => 'Full path to the imagemagick convert application, e.g. /usr/bin/convert',
'SEARCH_IMAGICK' => 'Search Imagick', 'SEARCH_IMAGICK' => 'Search for Imagemagick',
'MAX_IMAGE_SIZE' => 'Maximum Image Dimensions', 'MAX_IMAGE_SIZE' => 'Maximum Image Dimensions',
'MAX_IMAGE_SIZE_EXPLAIN' => 'Here you can define the maximum allowed Image Dimension to be attached. If it is set to 0x0, this feature is disabled.<br />(Width x Height in pixels)', 'MAX_IMAGE_SIZE_EXPLAIN' => 'Maximum size of image attachments, 0px by 0px disables image attachments.',
'IMAGE_LINK_SIZE' => 'Image Link Dimensions', 'IMAGE_LINK_SIZE' => 'Image Link Dimensions',
'IMAGE_LINK_SIZE_EXPLAIN' => 'If this defined Dimension of an Image is reached, the Image will be displayed as a Link. Only useful if Thumbnailing is enabled. If it is set to 0x0, this feature is disabled.<br />(Width x Height in pixels).', 'IMAGE_LINK_SIZE_EXPLAIN' => 'Display image attachment as link if image is larger than this, set to 0px by 0px to disable.',
'DIRECTORY_DOES_NOT_EXIST' => 'The Directory \'%s\' does not exist or couldn\'t be found.',
'DIRECTORY_IS_NOT_A_DIR' => 'Please check if \'%s\' is a directory.',
'DIRECTORY_NOT_WRITEABLE' => 'Directory \'%s\' is not writeable. You\'ll have to create the upload path and chmod it to 777 (or change the owner to you httpd-servers owner) to upload files.<br />If you have only plain ftp-access change the \'Attribute\' of the directory to rwxrwxrwx.',
'NO_UPLOAD_DIR' => 'The upload directory you specified does not exist.',
'UPLOAD_NOT_DIR' => 'The upload location you specified does not appear to be a directory.',
'NO_WRITE_UPLOAD' => 'The upload directory you specified cannot be written to. Please alter the permissions to allow the webserver to write to it.',
'ATTACHMENTS' => 'Attachments', 'ATTACHMENTS' => 'Attachments',
'ATTACH_EXTENSIONS_URL' => 'Extensions', 'ATTACH_EXTENSIONS_URL' => 'Extensions',