diff --git a/phpBB/adm/admin_board.php b/phpBB/adm/admin_board.php index 694d3a8b1a..1d7b8a70e9 100644 --- a/phpBB/adm/admin_board.php +++ b/phpBB/adm/admin_board.php @@ -181,6 +181,10 @@ switch ($mode) lang['MAX_FILESIZE']; ?>:
lang['MAX_FILESIZE_EXPLAIN']; ?> Bytes + + lang['MIN_AVATAR_SIZE']; ?>:
lang['MIN_AVATAR_SIZE_EXPLAIN']; ?> + x + lang['MAX_AVATAR_SIZE']; ?>:
lang['MAX_AVATAR_SIZE_EXPLAIN']; ?> x @@ -308,6 +312,10 @@ switch ($mode) lang['PASSWORD_LENGTH']; ?>:
lang['PASSWORD_LENGTH_EXPLAIN']; ?> lang['MIN_CHARS']; ?>   lang['MAX_CHARS']; ?> + + lang['MIN_RATINGS']; ?>:
lang['MIN_RATINGS_EXPLAIN']; ?> + + lang['ALLOW_EMAIL_REUSE']; ?>:
lang['ALLOW_EMAIL_REUSE_EXPLAIN']; ?> /> lang['YES']; ?>   /> lang['NO']; ?> diff --git a/phpBB/adm/admin_email.php b/phpBB/adm/admin_email.php index 2a1d0b38ca..00353ee399 100644 --- a/phpBB/adm/admin_email.php +++ b/phpBB/adm/admin_email.php @@ -39,60 +39,66 @@ if (!$auth->acl_get('a_email')) } // Set some vars -$message = ''; -$subject = ''; +$message = $subject = $group_id = ''; // Do the job ... if (isset($_POST['submit'])) { - // Increase maximum execution time in case of a lot of users, but don't complain about it if it isn't - // allowed. + // Increase maximum execution time in case of a lot of users, but don't complain + // about it if it isn't allowed. @set_time_limit(1200); - $group_id = intval($_POST['g']); + // Error checking needs to go here ... if no subject and/or no message then skip + // over the send and return to the form + $group_id = (isset($_POST['g'])) ? intval($_POST['g']) : 0; + $subject = (!empty($_POST['subject'])) ? stripslashes(trim($_POST['subject'])) : ''; + $message = (!empty($_POST['message'])) ? stripslashes(trim($_POST['message'])) : ''; - if ($group_id > 0) + $error = array(); + if ($subject == '') { - $sql = 'SELECT u.user_email, u.username, u.user_lang - FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug - WHERE ug.group_id = $group_id - AND g.user_pending <> " . TRUE . " - AND u.user_id = ug.user_id"; - } - else - { - $sql = 'SELECT user_email FROM ' . USERS_TABLE; - } - $result = $db->sql_query($sql); - - $subject = stripslashes(trim($_POST['subject'])); - $message = stripslashes(trim($_POST['message'])); - - if (!($row = $db->sql_fetchrow($result))) - { - // Output a relevant GENERAL_MESSAGE about users/group - // not existing - trigger_error($user->lang['GROUP_DOES_NOT_EXIST']); + $error[] = $user->lang['NO_EMAIL_SUBJECT']; } - - // Error checking needs to go here ... if no subject and/or - // no message then skip over the send and return to the form - - - if ($subject != '' && $message != '') + if ($message == '') { - include($phpbb_root_path . 'includes/emailer.'.$phpEx); + $error[] = $user->lang['NO_EMAIL_MESSAGE']; + } - // Let's do some checking to make sure that mass mail functions - // are working in win32 versions of php. - if (preg_match('/[c-z]:\\\.*/i', getenv('PATH')) && !$config['smtp_delivery']) + if (!sizeof($error)) + { + $sql = ($group_id) ? 'SELECT u.user_email, u.username, u.user_lang FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug WHERE ug.group_id = $group_id AND ug.user_pending <> 1 AND u.user_id = ug.user_id AND u.user_allow_massemail = 1" : 'SELECT user_email FROM ' . USERS_TABLE . ' WHERE user_allow_massemail = 1'; + $result = $db->sql_query($sql); + + if (!($row = $db->sql_fetchrow($result))) { - // We are running on windows, force delivery to use - // our smtp functions since php's are broken by default - $config['smtp_delivery'] = 1; - $config['smtp_host'] = get_cfg_var('SMTP'); + trigger_error($user->lang['NO_USER']); } + $db->sql_freeresult($result); + + $i = 0; + $email_list = array(); + do + { + $email_list[$row['user_lang']][$i]['email'] = $row['user_email']; + $email_list[$row['user_lang']][$i]['name'] = $row['username']; + $i++; + } + while ($row = $db->sql_fetchrow($result)); + $db->sql_freeresult($result); + + + // Let's do some checking to make sure that mass mail functions are working in win32 versions of php. + if (preg_match('#^[c-z]:\\\#i', getenv('PATH')) && !$config['smtp_delivery'] && phpversion() < '4.3') + { + // We are running on windows, force delivery to use our smtp functions since + // php's are broken by default + $config['smtp_delivery'] = 1; + $config['smtp_host'] = @ini_get('SMTP'); + } + + + include($phpbb_root_path . 'includes/emailer.'.$phpEx); $emailer = new emailer(true); $extra_headers = 'X-AntiAbuse: Board servername - ' . $config['server_name'] . "\r\n"; @@ -100,62 +106,72 @@ if (isset($_POST['submit'])) $extra_headers .= 'X-AntiAbuse: Username - ' . $user->data['username'] . "\r\n"; $extra_headers .= 'X-AntiAbuse: User IP - ' . $user->ip . "\r\n"; - $email_list = array(); - $count = 0; - do + foreach ($email_list as $lang => $to_ary) { - $email_list[$count]['email'] = $row['user_email']; - $email_list[$count]['name'] = $row['username']; - $email_list[$count]['lang'] = $row['user_lang']; - $count++; - } - while ($row = $db->sql_fetchrow($result)); - $db->sql_freeresult($result); + foreach ($to_ary as $to) + { + $emailer->template('admin_send_email', $lang); - foreach ($email_list as $addr) - { - $emailer->template('admin_send_email', $addr['lang']); + $emailer->subject($subject); + $emailer->headers($extra_headers); - $emailer->subject($subject); - $emailer->headers($extra_headers); + $emailer->replyto($config['board_email']); + $emailer->to($to['email'], $to['name']); - $emailer->replyto($config['board_email']); - $emailer->to($addr['email'], $addr['name']); + $emailer->assign_vars(array( + 'SITENAME' => $config['sitename'], + 'CONTACT_EMAIL' => $config['board_contact'], + 'MESSAGE' => $message) + ); - - $emailer->assign_vars(array( - 'SITENAME' => $config['sitename'], - 'CONTACT_EMAIL' => $config['board_contact'], - 'MESSAGE' => $message) - ); - - $emailer->send(); - $emailer->reset(); + $emailer->send(); + $emailer->reset(); + } } - + $emailer->queue->save(); unset($email_list); - - add_log('admin', 'LOG_MASS_EMAIL'); - trigger_error($user->lang['EMAIL_SENT'], E_USER_NOTICE); + + if ($group_id) + { + $sql = 'SELECT group_name + FROM ' . GROUPS_TABLE . " + WHERE group_id = $group_id"; + $result = $db->sql_query($sql); + + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + extract($row); + } + else + { + // Not great but the logging routine doesn't cope well with localising + // on the fly + $group_name = $user->lang['ALL_USERS']; + } + + add_log('admin', 'LOG_MASS_EMAIL', $group_name); + trigger_error($user->lang['EMAIL_SENT']); } } // Initial selection -$sql = 'SELECT group_id, group_name - FROM ' . GROUPS_TABLE; +$sql = 'SELECT group_id, group_type, group_name + FROM ' . GROUPS_TABLE . ' + ORDER BY group_type DESC, group_name ASC'; $result = $db->sql_query($sql); -$select_list = ''; +$db->sql_freeresult($result); adm_page_header($user->lang['MASS_EMAIL']); @@ -165,22 +181,35 @@ adm_page_header($user->lang['MASS_EMAIL']);

lang['MASS_EMAIL_EXPLAIN']; ?>

-
- +
+ + + + + - + - + + diff --git a/phpBB/adm/admin_forums.php b/phpBB/adm/admin_forums.php index b43ef2437b..37a74153f5 100644 --- a/phpBB/adm/admin_forums.php +++ b/phpBB/adm/admin_forums.php @@ -515,15 +515,15 @@ switch ($mode) - + - + - + sql_fetchrow($result)) +
lang['COMPOSE']; ?>
', $error); ?>
lang['RECIPIENTS']; ?>
lang['SUBJECT']; ?>
lang['MESSAGE']; ?> -
lang['FORUM_TOPICS_PAGE'] ?>:
lang['FORUM_TOPICS_PAGE_EXPLAIN']; ?>
lang['FORUM_PASSWORD'] ?>:
lang['FORUM_PASSWORD_EXPLAIN']; ?>
lang['FORUM_PASSWORD_CONFIRM'] ?>:
lang['FORUM_PASSWORD_CONFIRM_EXPLAIN']; ?>
- - - - + + +
 lang['TOPICS']; ?>: / lang['POSTS']; ?>:
-
+ + + + + +
 lang['TOPICS']; ?>: / lang['POSTS']; ?>:
+ lang['MOVE_UP'] ?>
lang['MOVE_DOWN'] ?>  lang['EDIT'] ?> | lang['DELETE'] ?>sql_fetchrow($result)) ?> - +
diff --git a/phpBB/adm/admin_icons.php b/phpBB/adm/admin_icons.php index 1555910972..09912ccb54 100644 --- a/phpBB/adm/admin_icons.php +++ b/phpBB/adm/admin_icons.php @@ -721,37 +721,4 @@ function update_image_dimensions() break; } -// --------- -// FUNCTIONS -// -function filelist($rootdir, $dir = '', $type = 'gif|jpg|png') -{ - static $images = array(); - - $dh = opendir($rootdir . $dir); - - while ($fname = readdir($dh)) - { - if (is_file($rootdir . $dir . '/' . $fname) && - preg_match('#\.' . $type . '$#i', $fname) && - filesize($rootdir . $dir . '/' . $fname)) - { - $images[] = array('path' => $dir, 'file' => $fname); - } - else if ($fname != '.' && $fname != '..' && - !is_file($rootdir . $dir . '/' . $fname) && - !is_link($rootdir . $dir . '/' . $fname)) - { - filelist($rootdir, $dir . '/'. $fname, $type); - } - } - - closedir($dh); - - return $images; -} -// -// FUNCTIONS -// --------- - ?> \ No newline at end of file diff --git a/phpBB/adm/admin_prune.php b/phpBB/adm/admin_prune.php index 6318f04785..dc8c27b580 100644 --- a/phpBB/adm/admin_prune.php +++ b/phpBB/adm/admin_prune.php @@ -220,7 +220,7 @@ else lang['YES']; ?>   lang['NO']; ?> - + diff --git a/phpBB/adm/admin_ranks.php b/phpBB/adm/admin_ranks.php index 48b7bcb45f..7899e3bd27 100644 --- a/phpBB/adm/admin_ranks.php +++ b/phpBB/adm/admin_ranks.php @@ -277,9 +277,7 @@ function update_image_dimensions() sql_query($sql); @@ -329,37 +327,4 @@ function update_image_dimensions() break; } -// --------- -// FUNCTIONS -// -function filelist($rootdir, $dir = '', $type = 'gif|jpg|jpeg|png') -{ - static $images = array(); - - $dh = opendir($rootdir . $dir); - - while ($fname = readdir($dh)) - { - if (is_file($rootdir . $dir . '/' . $fname) && - preg_match('#\.' . $type . '$#i', $fname) && - filesize($rootdir . $dir . '/' . $fname)) - { - $images[] = array('path' => $dir, 'file' => $fname); - } - else if ($fname != '.' && $fname != '..' && - !is_file($rootdir . $dir . '/' . $fname) && - !is_link($rootdir . $dir . '/' . $fname)) - { - filelist($rootdir, $dir . '/'. $fname, $type); - } - } - - closedir($dh); - - return $images; -} -// -// FUNCTIONS -// --------- - ?> \ No newline at end of file diff --git a/phpBB/adm/subSilver.css b/phpBB/adm/subSilver.css index 6892d07784..f32f26ddeb 100644 --- a/phpBB/adm/subSilver.css +++ b/phpBB/adm/subSilver.css @@ -100,6 +100,7 @@ a.nav:hover { font: 8pt Verdana, Arial, Helvetica, sans-serif; letter-spacing: -1px; } +.error { color: #FF0000 } /* Tables diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index fc37f15cd8..8ce0975dc8 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -157,6 +157,33 @@ function get_forum_branch($forum_id, $type = 'all', $order = 'descending', $incl return $rows; } +function filelist($rootdir, $dir = '', $type = 'gif|jpg|jpeg|png') +{ + static $matches = array(); + + $dh = opendir($rootdir . $dir); + + while ($fname = readdir($dh)) + { + if (is_file($rootdir . $dir . '/' . $fname) && + preg_match('#\.' . $type . '$#i', $fname) && + filesize($rootdir . $dir . '/' . $fname)) + { + $matches[] = array('path' => $dir, 'file' => $fname); + } + else if ($fname != '.' && $fname != '..' && + !is_file($rootdir . $dir . '/' . $fname) && + !is_link($rootdir . $dir . '/' . $fname)) + { + filelist($rootdir, $dir . '/'. $fname, $type); + } + } + + closedir($dh); + + return $matches; +} + // Posts and topics manipulation function move_topics($topic_ids, $forum_id, $auto_sync = TRUE) { diff --git a/phpBB/install/schemas/mysql_basic.sql b/phpBB/install/schemas/mysql_basic.sql index 7e464875e5..36e665d204 100644 --- a/phpBB/install/schemas/mysql_basic.sql +++ b/phpBB/install/schemas/mysql_basic.sql @@ -36,6 +36,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_name_chars','3 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_name_chars','30'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_pass_chars','6'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_pass_chars','30'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_ratings','10'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_length','3600'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('sitename','yourdomain.com'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_desc','A _little_ text to describe your forum'); @@ -94,6 +95,8 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('require_activation INSERT INTO phpbb_config (config_name, config_value) VALUES ('flood_interval','15'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_interval','0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_filesize','6144'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_min_width','20'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_min_height','20'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_width','90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_height','90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_enable','1'); diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql index 75dd85a31f..4d1c836d9a 100644 --- a/phpBB/install/schemas/mysql_schema.sql +++ b/phpBB/install/schemas/mysql_schema.sql @@ -868,6 +868,7 @@ CREATE TABLE phpbb_users ( user_allow_email tinyint(1) DEFAULT '1' NOT NULL, user_allow_viewonline tinyint(1) DEFAULT '1' NOT NULL, user_allow_viewemail tinyint(1) DEFAULT '1' NOT NULL, + user_allow_massemail tinyint(1) DEFAULT '1' NOT NULL, user_avatar varchar(100) DEFAULT '' NOT NULL, user_avatar_type tinyint(2) DEFAULT '0' NOT NULL, user_avatar_width tinyint(4) UNSIGNED DEFAULT '0' NOT NULL, diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php index 524429965b..e688a92e45 100644 --- a/phpBB/language/en/lang_admin.php +++ b/phpBB/language/en/lang_admin.php @@ -92,21 +92,21 @@ $lang = array_merge($lang, array( 'LOOK_UP_FORUM' => 'Select a Forum', - 'log_index_activate' => 'Activated inactive users
%s users', - 'log_index_delete' => 'Deleted inactive users
%s', - 'LOG_INDEX_REMIND' => 'Sent reminder emails to inactive users
%s', - 'LOG_MASS_EMAIL' => 'Sent mass email
%s', + 'log_index_activate' => 'Activated inactive users
» %s users', + 'log_index_delete' => 'Deleted inactive users
» %s', + 'LOG_INDEX_REMIND' => 'Sent reminder emails to inactive users
» %s', + 'LOG_MASS_EMAIL' => 'Sent mass email
» %s', 'log_delete_word' => 'Deleted word censor', - 'log_edit_word' => 'Edited word censor
%s', - 'log_add_word' => 'Added word censor
%s', + 'log_edit_word' => 'Edited word censor
» %s', + 'log_add_word' => 'Added word censor
» %s', 'log_template_edit' => 'Edited template
%s / %s', - 'log_imageset_edit' => 'Edited imageset
%s', - 'log_style_edit' => 'Edited style
%s', - 'log_theme_edit' => 'Edited theme
%s', + 'log_imageset_edit' => 'Edited imageset
» %s', + 'log_style_edit' => 'Edited style
» %s', + 'log_theme_edit' => 'Edited theme
» %s', 'log_db_backup' => 'Database backup', 'log_db_restore' => 'Database restore', - 'log_search_index' => 'Re-indexed search system
%s', - 'log_disallow_add' => 'Added disallowed username
%s', + 'log_search_index' => 'Re-indexed search system
» %s', + 'log_disallow_add' => 'Added disallowed username
» %s', 'log_disallow_delete' => 'Deleted disallowed username', 'log_admin_clear' => 'Cleared admin log', @@ -130,6 +130,7 @@ $lang = array_merge($lang, array( 'LOG_EMAIL_CONFIG' => 'Altered email settings', 'LOG_AVATAR_CONFIG' => 'Altered avatar settings', 'LOG_AUTH_CONFIG' => 'Altered authentication settings', + 'LOG_LOAD_CONFIG' => 'Altered load settings', 'LOG_ATTACH_CONFIG' => 'Altered attachment settings', @@ -448,6 +449,8 @@ $lang = array_merge($lang, array( 'ALLOW_UPLOAD' => 'Enable avatar uploading', 'MAX_FILESIZE' => 'Maximum Avatar File Size', 'MAX_FILESIZE_EXPLAIN' => 'For uploaded avatar files', + 'MIN_AVATAR_SIZE' => 'Minimum Avatar Dimensions', + 'MIN_AVATAR_SIZE_EXPLAIN' => '(Height x Width in pixels)', 'MAX_AVATAR_SIZE' => 'Maximum Avatar Dimensions', 'MAX_AVATAR_SIZE_EXPLAIN' => '(Height x Width in pixels)', 'AVATAR_STORAGE_PATH' => 'Avatar Storage Path', @@ -606,6 +609,8 @@ $lang = array_merge($lang, array( 'PASSWORD_LENGTH_EXPLAIN' => 'Minimum and maximum number of characters in passwords.', 'MIN_CHARS' => 'Min', 'MAX_CHARS' => 'Max', + 'MIN_RATINGS' => 'Ratings count before karma', + 'MIN_RATINGS_EXPLAIN' => 'Number of distinct ratings before users karma is calculated.', 'ALLOW_EMAIL_REUSE' => 'Allow Email address re-use', 'ALLOW_EMAIL_REUSE_EXPLAIN' => 'Different users can register with the same email address.', 'ALLOW_ATTACHMENTS' => 'Allow Attachments', @@ -846,6 +851,9 @@ $lang = array_merge($lang, array( 'COMPOSE' => 'Compose', 'RECIPIENTS' => 'Recipients', 'ALL_USERS' => 'All Users', + 'NO_EMAIL_SUBJECT' => 'You must specify a subject for your message.', + 'NO_EMAIL_MESSAGE' => 'You must enter a message.', + 'EMAIL_SENT' => 'Your message has been queued for sending.', 'RANKS_EXPLAIN' => 'Using this form you can add, edit, view and delete ranks. You can also create custom ranks which can be applied to a user via the user management facility', @@ -887,7 +895,7 @@ $lang = array_merge($lang, array( 'Template' => 'Select template', 'Download' => 'Download', 'Edit_theme' => 'Edit Theme', - 'Edit_theme_explain' => 'Use this panel to edit an existing theme. You can modify (or add) both CSS to be included within each page output by the forum (subject to the template including it) and an externally linked stylesheet. Remember, the location of the stylesheet is relative to the phpBB root directory.', + 'Edit_theme_explain' => 'Use this panel to edit an existing theme. Each editable class can be selected individually. Set only the parameters you need, e.g. if you do not want a border leave the border parameters blank.', 'Select_theme' => 'Select theme', 'CSS_data' => 'CSS Data', 'CSS_data_explain' => 'This CSS is output to the template and may be included within the header of each page.', diff --git a/phpBB/language/en/lang_main.php b/phpBB/language/en/lang_main.php index 36dbd70d0e..45be7c2893 100644 --- a/phpBB/language/en/lang_main.php +++ b/phpBB/language/en/lang_main.php @@ -226,6 +226,7 @@ $lang = array( 'RETURN_INDEX' => 'Click %sHere%s to return to the index', 'RETURN_TOPIC' => 'Click %sHere%s to return to the topic', + 'RETURN_POST' => 'Click %sHere%s to return to the post', 'RETURN_FORUM' => 'Click %sHere%s to return to the forum', 'RETURN_LOGIN' => 'Click %sHere%s to try again', 'RETURN_MCP' => 'Click %sHere%s to return to the Moderator Control Panel', @@ -299,6 +300,20 @@ $lang = array( 'LOGIN_FORUM' => 'To view or post in this forum you must enter a password.', 'WRONG_PASSWORD'=> 'You entered an incorrect password.', + 'KARMA' => array( + '-5' => 'Extremely Bad', + '-4' => 'Very Bad', + '-3' => 'Very Poor', + '-2' => 'Bad', + '-1' => 'Poor', + '0' => 'Neutral', + '1' => 'Not Bad', + '2' => 'Good', + '3' => 'Very Good', + '4' => 'Extremely good', + '5' => 'Excellent' + ), + 'INDEX' => 'Index page', 'REDIRECTS' => 'Total redirects', @@ -420,6 +435,7 @@ $lang = array( 'VIEW_FORUM_TOPICS' => '%d Topics', + // Viewtopic 'VIEW_TOPIC' => 'View topic', 'LOGIN_VIEWTOPIC' => 'The board administrator requires you to be registered and logged in to view this topic.', 'PRINT_TOPIC' => 'Print View', @@ -438,10 +454,14 @@ $lang = array( 'BACK_TO_TOP' => 'Back to top', 'POST_SUBJECT' => 'Post subject', + 'KARMA_LEVEL' => 'Karma Level', 'READ_PROFILE' => 'Profile', 'SEND_EMAIL' => 'Email', 'VISIT_WEBSITE' => 'WWW', - 'ICQ_STATUS' => 'ICQ Status', + 'ICQ_STATUS' => 'ICQ Status', + 'RATE' => 'Rate', + 'RATE_GOOD' => 'Good', + 'RATE_BAD' => 'Bad', 'EDIT_POST' => 'Edit', 'VIEW_IP' => 'IP', 'DELETE_POST' => 'Delete', @@ -488,6 +508,9 @@ $lang = array( 'POLL_RUN_TILL' => 'Poll runs till %s', // %s = date/time 'VOTE_SUBMITTED' => 'Your vote has been cast', + 'RATING_UPDATED' => 'Your existing rating for this poster has been updated', + 'RATING_ADDED' => 'Your rating for this poster has been saved.', + 'VIEW_TOPIC_POST' => '1 Post', 'VIEW_TOPIC_POSTS' => '%d Posts', @@ -721,7 +744,7 @@ $lang = array( 'AVATAR_URL_INVALID' => 'The URL you specified is invalid.', 'AVATAR_NOT_UPLOADED' => 'Avatar could not be uploaded.', - 'AVATAR_WRONG_SIZE' => 'The avatar must be at most %1$d pixels wide and %2$d pixels high.', + 'AVATAR_WRONG_SIZE' => 'The avatar must be at least %1$d pixels wide, %2$d pixels high and at most %3$d pixels wide and %4$d pixels high.', 'AVATAR_WRONG_FILESIZE' => 'The avatar must be between 0 and %d bytes.', 'AVATAR_NO_SIZE' => 'Could not obtain width or height of linked avatar, please enter them manually.', @@ -735,6 +758,7 @@ $lang = array( 'NOTIFY_ON_PM' => 'Email me on new private messages', 'POPUP_ON_PM' => 'Pop up window on new private message', 'SHOW_EMAIL' => 'Users can contact me by email', + 'ADMIN_EMAIL' => 'Administrators can email me information', 'BOARD_STYLE' => 'My board style', 'BOARD_LANGUAGE' => 'My language', 'BOARD_TIMEZONE' => 'My timezone', @@ -749,6 +773,8 @@ $lang = array( 'VIEW_SIGS' => 'Display Signatures', 'VIEW_AVATARS' => 'Display Avatars', 'DISABLE_CENSORS' => 'Enable Word censoring', + 'MINIMUM_KARMA' => 'Minimum User Karma', + 'MINIMUM_KARMA_EXPLAIN'=> 'Posts by users with Karma less than this will be ignored.', 'VIEW_TOPICS_DAYS' => 'Display topics from previous days', 'VIEW_TOPICS_KEY' => 'Display topics ordering by', 'VIEW_TOPICS_DIR' => 'Display topic order direction',