From 75ccd0e13cea666fafe63a9bfb99b1513d7d1126 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Thu, 6 Nov 2003 13:08:37 +0000 Subject: [PATCH] Some attachment related changes to lang/layout git-svn-id: file:///svn/phpbb/trunk@4651 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/admin_board.php | 128 +++++++++++++++---------------- phpBB/language/en/lang_admin.php | 68 ++++++++-------- 2 files changed, 98 insertions(+), 98 deletions(-) diff --git a/phpBB/adm/admin_board.php b/phpBB/adm/admin_board.php index 6989e96c0b..a3e553134a 100644 --- a/phpBB/adm/admin_board.php +++ b/phpBB/adm/admin_board.php @@ -34,7 +34,8 @@ $phpEx = substr(strrchr(__FILE__, '.'), 1); require('pagestart.' . $phpEx); // Get mode -$mode = request_var('mode', ''); +$mode = request_var('mode', ''); +$action = request_var('action', ''); $submit = (isset($_POST['submit'])) ? true : false; // Check permissions/set title @@ -109,6 +110,7 @@ while ($row = $db->sql_fetchrow($result)) $default_config[$config_name] = $config_value; $new[$config_name] = request_var($config_name, $default_config[$config_name]); + if ($config_name == 'bump_interval' && $submit) { $new['bump_interval'] = request_var('bump_interval', 0) . request_var('bump_type', ''); @@ -195,23 +197,23 @@ adm_page_header($user->lang[$l_title]);

lang[$l_title . '_EXPLAIN']; ?>

- -

lang['WARNING']; ?>

- -

', $error); ?>

- -
" method="post"> + + + + - + - - + + - - - - - + - + + + + + - + - + - - - - + - + - + - + - - + + - - + + - - + + - + @@ -375,7 +370,7 @@ switch ($mode) ?> - + @@ -437,7 +432,7 @@ switch ($mode) ?> - + @@ -505,7 +500,7 @@ switch ($mode) - + @@ -578,7 +573,7 @@ switch ($mode) } ?> - + @@ -682,15 +677,15 @@ switch ($mode) - + - + - + @@ -809,7 +804,7 @@ switch ($mode) ?> - + @@ -908,7 +903,7 @@ switch ($mode) ?> - + - +
lang[$l_title]; ?>
', $error); ?>
lang['UPLOAD_DIR']; ?>:
lang['UPLOAD_DIR_EXPLAIN']; ?>		lang['UPLOAD_DIR']; ?>:
lang['UPLOAD_DIR_EXPLAIN']; ?>
lang['DISPLAY_ORDER']; ?>:
lang['DISPLAY_ORDER_EXPLAIN']; ?>		 - - - - - - - -
/> lang['DESCENDING']; ?>
/> lang['ASCENDING']; ?>
lang['DISPLAY_ORDER']; ?>:
lang['DISPLAY_ORDER_EXPLAIN']; ?>		 /> lang['DESCENDING']; ?>   /> lang['ASCENDING']; ?>
lang['ATTACH_MAX_FILESIZE']; ?>:
lang['ATTACH_MAX_FILESIZE_EXPLAIN']; ?>
lang['ATTACH_QUOTA']; ?>:
lang['ATTACH_QUOTA_EXPLAIN']; ?>		lang['ATTACH_QUOTA']; ?>:
lang['ATTACH_QUOTA_EXPLAIN']; ?>
lang['ATTACH_MAX_PM_FILESIZE']; ?>:
lang['ATTACH_MAX_PM_FILESIZE_EXPLAIN']; ?>		lang['ATTACH_MAX_FILESIZE']; ?>:
lang['ATTACH_MAX_FILESIZE_EXPLAIN']; ?>
lang['ATTACH_MAX_PM_FILESIZE']; ?>:
lang['ATTACH_MAX_PM_FILESIZE_EXPLAIN']; ?>
lang['MAX_ATTACHMENTS'] ?>: lang['MAX_ATTACHMENTS'] ?>:
lang['MAX_ATTACHMENTS_PM'] ?>: lang['MAX_ATTACHMENTS_PM'] ?>:
lang['SETTINGS_CAT_IMAGES']; ?>
lang['ASSIGNED_GROUP']; ?>: lang['NONE']); ?>lang['ASSIGNED_GROUP']; ?>: lang['NONE']); ?>
lang['DISPLAY_INLINED']; ?>:
lang['DISPLAY_INLINED_EXPLAIN']; ?>		lang['DISPLAY_INLINED']; ?>:
lang['DISPLAY_INLINED_EXPLAIN']; ?>		 /> lang['YES']; ?>   /> lang['NO']; ?>
lang['CREATE_THUMBNAIL']; ?>:
lang['CREATE_THUMBNAIL_EXPLAIN']; ?>		lang['CREATE_THUMBNAIL']; ?>:
lang['CREATE_THUMBNAIL_EXPLAIN']; ?>		 /> lang['YES']; ?>   /> lang['NO']; ?>
lang['MIN_THUMB_FILESIZE']; ?>:
lang['MIN_THUMB_FILESIZE_EXPLAIN']; ?>		lang['MIN_THUMB_FILESIZE']; ?>:
lang['MIN_THUMB_FILESIZE_EXPLAIN']; ?>		 lang['BYTES']; ?>
lang['IMAGICK_PATH']; ?>:
lang['IMAGICK_PATH_EXPLAIN']; ?>		lang['IMAGICK_PATH']; ?>:
lang['IMAGICK_PATH_EXPLAIN']; ?>		  [ ">lang['SEARCH_IMAGICK']; ?> ]
lang['MAX_IMAGE_SIZE']; ?>:
lang['MAX_IMAGE_SIZE_EXPLAIN']; ?>		 x lang['MAX_IMAGE_SIZE']; ?>:
lang['MAX_IMAGE_SIZE_EXPLAIN']; ?>		 px X px
lang['IMAGE_LINK_SIZE']; ?>:
lang['IMAGE_LINK_SIZE_EXPLAIN']; ?>		 x lang['IMAGE_LINK_SIZE']; ?>:
lang['IMAGE_LINK_SIZE_EXPLAIN']; ?>		 px X px
lang['COOKIE_DOMAIN']; ?>: lang['COOKIE_DOMAIN']; ?>:
lang['ALLOW_LOCAL']; ?>: lang['ALLOW_LOCAL']; ?>: /> lang['YES']; ?>   /> lang['NO']; ?>
lang['DEFAULT_STYLE']; ?>lang['DEFAULT_STYLE']; ?>
/> lang['YES']; ?>   /> lang['NO']; ?>
lang['ALLOW_PM_ATTACHMENTS']; ?>: lang['ALLOW_PM_ATTACHMENTS']; ?>: /> lang['YES']; ?>   /> lang['NO']; ?>
lang['SITE_NAME']; ?>: lang['SITE_NAME']; ?>:
/> lang['ENABLED']; ?>   /> lang['DISABLED']; ?>
lang['EMAIL_PACKAGE_SIZE']; ?>:
lang['EMAIL_PACKAGE_SIZE_EXPLAIN']; ?>		lang['EMAIL_PACKAGE_SIZE']; ?>:
lang['EMAIL_PACKAGE_SIZE_EXPLAIN']; ?>
lang['CONTACT_EMAIL']; ?>:
lang['CONTACT_EMAIL_EXPLAIN']; ?>		lang['CONTACT_EMAIL']; ?>:
lang['CONTACT_EMAIL_EXPLAIN']; ?>
lang['ADMIN_EMAIL']; ?>:
lang['ADMIN_EMAIL_EXPLAIN']; ?>		lang['ADMIN_EMAIL']; ?>:
lang['ADMIN_EMAIL_EXPLAIN']; ?>
lang['LIMIT_LOAD']; ?>:
lang['LIMIT_LOAD_EXPLAIN']; ?>		lang['LIMIT_LOAD']; ?>:
lang['LIMIT_LOAD_EXPLAIN']; ?>
lang['AUTH_METHOD']; ?>: lang['AUTH_METHOD']; ?>:
  lang['SEARCH_IMAGICK'] . '" class="btnlite" />  ' : ''; ?>  
@@ -1001,7 +996,7 @@ function search_imagemagick() 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); continue; @@ -1030,24 +1025,27 @@ function test_upload(&$error, $upload_dir, $create_directory = false) { if (!file_exists($upload_dir)) { - @mkdir($upload_dir, 0755); + @mkdir($upload_dir, 0777); @chmod($upload_dir, 0777); } } - + 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; } } diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php index 2ea229e241..e9898da41d 100644 --- a/phpBB/language/en/lang_admin.php +++ b/phpBB/language/en/lang_admin.php @@ -53,6 +53,10 @@ $lang += array( 'MOD_LOGS' => 'Moderator Log', 'CRITICAL_LOGS' => 'Error Log', + 'PERM_CAT' => 'Permissions', + 'USER_PERMS' => 'User permissions', + 'GROUP_PERMS' => 'Group permissions', + 'POST_CAT' => 'Posting', 'SMILE' => 'Smilies', 'ICONS' => 'Icons', @@ -70,12 +74,10 @@ $lang += array( 'BAN_IPS' => 'Ban IPs', 'BAN_USERS' => 'Ban Usernames', 'DISALLOW' => 'Disallow names', - 'RANKS' => 'Manage Ranks', + 'RANKS' => 'Ranks', 'PRUNE_USERS' => 'Prune users', 'BOTS' => 'Manage Bots', 'GROUP_MANAGE' => 'Manage groups', - 'USER_PERMS' => 'User permissions', - 'GROUP_PERMS' => 'Group permissions', 'ADMINISTRATORS' => 'Administrators', 'USERNAMES_EXPLAIN' => 'Place each username on a seperate line', @@ -1613,41 +1615,41 @@ $lang += array( // Attachments $lang += array( - 'ATTACHMENT_SETTINGS' => 'Attachment Settings', - 'ATTACHMENT_SETTINGS_EXPLAIN' => 'Here you can configure the Main Settings for Attachments and the associated Special Categories.', - 'UPLOAD_DIR' => 'Upload Directory', - 'UPLOAD_DIR_EXPLAIN' => 'Storage Path for Attachments.', - '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).', - 'ATTACH_MAX_FILESIZE' => 'Filesize', - 'ATTACH_MAX_FILESIZE_EXPLAIN' => 'Maximum filesize allowed for one file. A value of 0 means \'unlimited\'.', - 'ATTACH_QUOTA' => 'Attachment Quota', - 'ATTACH_QUOTA_EXPLAIN' => 'Maximum Disk Space ALL Attachments can hold on your Webspace. A value of 0 means \'unlimited\'.', - 'ATTACH_MAX_PM_FILESIZE' => 'Maximum Filesize in Private Messages Folder', - '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\'.', - 'MAX_ATTACHMENTS' => 'Maximum Number of Attachments for one post', - 'MAX_ATTACHMENTS_PM' => 'Maximum Number of Attachments for one Private Message', + 'ATTACHMENT_SETTINGS' => 'Attachment Settings', + 'ATTACHMENT_SETTINGS_EXPLAIN' => 'Here you can configure the Main Settings for Attachments and the associated Special Categories.', - 'SETTINGS_CAT_IMAGES' => 'Settings for Special Category: Images', + 'UPLOAD_DIR' => 'Upload Directory', + 'UPLOAD_DIR_EXPLAIN' => 'Storage Path for Attachments.', + 'DISPLAY_ORDER' => 'Attachment Display Order', + 'DISPLAY_ORDER_EXPLAIN' => 'Display attachments ordering by time.', + 'ATTACH_MAX_FILESIZE' => 'Maximum filesize', + 'ATTACH_MAX_FILESIZE_EXPLAIN' => 'Maximum size of each file, 0 is unlimited.', + 'ATTACH_QUOTA' => 'Total attachment quota', + 'ATTACH_QUOTA_EXPLAIN' => 'Maximum drive space available for attachments in total, 0 is unlimited.', + 'ATTACH_MAX_PM_FILESIZE' => 'Maximum filesize messaging', + 'ATTACH_MAX_PM_FILESIZE_EXPLAIN' => 'Maximum drive space available per user for private message attachments, 0 is unlimited.', + 'MAX_ATTACHMENTS' => 'Max attachments per post', + 'MAX_ATTACHMENTS_PM' => 'Max attachments per message', + + 'SETTINGS_CAT_IMAGES' => 'Image category settings', 'ASSIGNED_GROUP' => 'Assigned Group', - 'DISPLAY_INLINED' => 'Display Images Inlined', - 'DISPLAY_INLINED_EXPLAIN' => 'Choose whether to display images directly within the post (yes) or to display images as a link.', - '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.', - 'MIN_THUMB_FILESIZE' => 'Minimum Thumbnail Filesize', - 'MIN_THUMB_FILESIZE_EXPLAIN' => 'If an Image is smaller than this defined Filesize no Thumbnail will be created.', - 'IMAGICK_PATH' => 'Imagick Program (Complete Path)', - 'IMAGICK_PATH_EXPLAIN' => 'Enter the Path to the convert program of imagick, normally /usr/bin/convert (on windows: c:/imagemagick/convert.exe).', - 'SEARCH_IMAGICK' => 'Search Imagick', + 'DISPLAY_INLINED' => 'Display images inline', + 'DISPLAY_INLINED_EXPLAIN' => 'If set to No image attachments will show as a link.', + 'CREATE_THUMBNAIL' => 'Create thumbnail', + 'CREATE_THUMBNAIL_EXPLAIN' => 'Create a thumbnail in all possible situations.', + 'MIN_THUMB_FILESIZE' => 'Minimum thumbnail filesize', + 'MIN_THUMB_FILESIZE_EXPLAIN' => 'Do not create a thumbnail for images smaller than this.', + 'IMAGICK_PATH' => 'Imagemagick path', + 'IMAGICK_PATH_EXPLAIN' => 'Full path to the imagemagick convert application, e.g. /usr/bin/convert', + 'SEARCH_IMAGICK' => 'Search for Imagemagick', '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.
(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_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.
(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.
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', 'ATTACH_EXTENSIONS_URL' => 'Extensions',