From 75ccd0e13cea666fafe63a9bfb99b1513d7d1126 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Thu, 6 Nov 2003 13:08:37 +0000 Subject: 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 | 120 +++++++++++++++++++++++----------------------- 1 file changed, 59 insertions(+), 61 deletions(-) (limited to 'phpBB/adm/admin_board.php') 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']; ?>

+
" method="post"> + + + -

lang['WARNING']; ?>

-

', $error); ?>

- - -" method="post">
lang[$l_title]; ?>
- + - + - - + + - - + + - - + + - + - + - + - - - - + - + - + - + - - + + - - + + - - + + - + @@ -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_FILESIZE']; ?>:
lang['ATTACH_MAX_FILESIZE_EXPLAIN']; ?>
lang['ATTACH_MAX_PM_FILESIZE']; ?>:
lang['ATTACH_MAX_PM_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; } } -- cgit v1.2.1