diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index 90d0dc27f8..2fc22d6371 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -30,7 +30,7 @@
- +
@@ -48,7 +48,7 @@
- +
@@ -67,7 +67,7 @@
- +
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 06d784292a..c448bf539f 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -94,7 +94,7 @@ {L_IMAGE}: - diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html index 29891a9014..7f1d002511 100755 --- a/phpBB/adm/style/install_header.html +++ b/phpBB/adm/style/install_header.html @@ -21,7 +21,7 @@
{S_LANG_SELECT} - +
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index 4c73f5ffa0..257edf57e8 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -78,7 +78,7 @@ class acp_attachments } $db->sql_freeresult($result); - $l_legend_cat_images = $user->lang['SETTINGS_CAT_IMAGES'] . ' [' . $user->lang['ASSIGNED_GROUP'] . ': ' . ((sizeof($s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE])) ? implode(', ', $s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE]) : $user->lang['NONE']) . ']'; + $l_legend_cat_images = $user->lang['SETTINGS_CAT_IMAGES'] . ' [' . $user->lang['ASSIGNED_GROUP'] . ': ' . ((sizeof($s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE])) ? implode(', ', $s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE]) : $user->lang['NO_EXT_GROUP']) . ']'; $display_vars = array( 'title' => 'ACP_ATTACHMENT_SETTINGS', @@ -521,7 +521,7 @@ class acp_attachments } $cat_lang = array( - ATTACHMENT_CATEGORY_NONE => $user->lang['NONE'], + ATTACHMENT_CATEGORY_NONE => $user->lang['NO_FILE_CAT'], ATTACHMENT_CATEGORY_IMAGE => $user->lang['CAT_IMAGES'], ATTACHMENT_CATEGORY_WM => $user->lang['CAT_WM_FILES'], ATTACHMENT_CATEGORY_RM => $user->lang['CAT_RM_FILES'] @@ -959,7 +959,7 @@ class acp_attachments global $db, $user; $types = array( - ATTACHMENT_CATEGORY_NONE => $user->lang['NONE'], + ATTACHMENT_CATEGORY_NONE => $user->lang['NO_FILE_CAT'], ATTACHMENT_CATEGORY_IMAGE => $user->lang['CAT_IMAGES'], ATTACHMENT_CATEGORY_WM => $user->lang['CAT_WM_FILES'], ATTACHMENT_CATEGORY_RM => $user->lang['CAT_RM_FILES'] diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 109d08163b..52890b4263 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -296,14 +296,14 @@ class acp_board 'title' => 'ACP_SECURITY_SETTINGS', 'vars' => array( 'legend1' => 'ACP_SECURITY_SETTINGS', - 'allow_autologin' => array('lang' => 'ALLOW_AUTOLOGIN', 'type' => 'radio:yes_no', 'explain' => true), - 'max_autologin_time' => array('lang' => 'AUTOLOGIN_LENGTH', 'type' => 'text:5:5', 'explain' => true), - 'ip_check' => array('lang' => 'IP_VALID', 'type' => 'custom', 'method' => 'select_ip_check', 'explain' => true), - 'browser_check' => array('lang' => 'BROWSER_VALID', 'type' => 'radio:yes_no', 'explain' => true), - 'pass_complex' => array('lang' => 'PASSWORD_TYPE', 'type' => 'select', 'method' => 'select_password_chars', 'explain' => true), - 'chg_passforce' => array('lang' => 'FORCE_PASS_CHANGE', 'type' => 'text:3:3', 'explain' => true), - 'max_login_attempts' => array('lang' => 'MAX_LOGIN_ATTEMPTS','type' => 'text:3:3', 'explain' => true), - 'tpl_allow_php' => array('lang' => 'TPL_ALLOW_PHP', 'type' => 'radio:yes_no', 'explain' => true), + 'allow_autologin' => array('lang' => 'ALLOW_AUTOLOGIN', 'type' => 'radio:yes_no', 'explain' => true), + 'max_autologin_time' => array('lang' => 'AUTOLOGIN_LENGTH', 'type' => 'text:5:5', 'explain' => true), + 'ip_check' => array('lang' => 'IP_VALID', 'type' => 'custom', 'method' => 'select_ip_check', 'explain' => true), + 'browser_check' => array('lang' => 'BROWSER_VALID', 'type' => 'radio:yes_no', 'explain' => true), + 'pass_complex' => array('lang' => 'PASSWORD_TYPE', 'type' => 'select', 'method' => 'select_password_chars', 'explain' => true), + 'chg_passforce' => array('lang' => 'FORCE_PASS_CHANGE', 'type' => 'text:3:3', 'explain' => true), + 'max_login_attempts' => array('lang' => 'MAX_LOGIN_ATTEMPTS', 'type' => 'text:3:3', 'explain' => true), + 'tpl_allow_php' => array('lang' => 'TPL_ALLOW_PHP', 'type' => 'radio:yes_no', 'explain' => true), ) ); break; @@ -606,7 +606,7 @@ class acp_board */ function select_ip_check($value, $key = '') { - $radio_ary = array(4 => 'ALL', 3 => 'CLASS_C', 2 => 'CLASS_B', 0 => 'NONE'); + $radio_ary = array(4 => 'ALL', 3 => 'CLASS_C', 2 => 'CLASS_B', 0 => 'NO_IP_VALIDATION'); return h_radio('config[ip_check]', $radio_ary, $value, $key); } diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 03ba2cf367..116bd3ab8b 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -1049,7 +1049,7 @@ pagination_sep = \'{PAGINATION_SEP}\' $selected = ($unit_option == $unit) ? ' selected="selected"' : ''; $s_units .= ""; } - $s_units = '' . $s_units; + $s_units = '' . $s_units; $template->assign_vars(array( strtoupper($var) => $value, @@ -1070,7 +1070,7 @@ pagination_sep = \'{PAGINATION_SEP}\' $s_imglist .= ""; } } - $s_imglist = '' . $s_imglist; + $s_imglist = '' . $s_imglist; $template->assign_vars(array( 'S_' . strtoupper($var) => $s_imglist) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 320cee5bf5..51c298a01d 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2590,7 +2590,7 @@ function page_header($page_title = '', $display_online_list = true) if (!$online_userlist) { - $online_userlist = $user->lang['NONE']; + $online_userlist = $user->lang['NO_ONLINE_USERS']; } if (empty($_REQUEST['f'])) diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index a3b471a46e..176d9b36c1 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -384,7 +384,7 @@ function move_topics($topic_ids, $forum_id, $auto_sync = true) { $sql = 'SELECT DISTINCT forum_id FROM ' . TOPICS_TABLE . ' - WHERE topic_id ' . $sql_where; + WHERE topic_id IN (' . implode(', ', $topic_ids) . ')'; $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 72f240b2e1..ef75b85a48 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1264,7 +1264,7 @@ function avatar_gallery($category, $avatar_select, $items_per_column, $block_var if (!file_exists($path) || !is_dir($path)) { - $avatar_list = array($user->lang['NONE'] => array()); + $avatar_list = array($user->lang['NO_AVATAR_CATEGORY'] => array()); } else { @@ -1304,7 +1304,7 @@ function avatar_gallery($category, $avatar_select, $items_per_column, $block_var if (!sizeof($avatar_list)) { - $avatar_list = array($user->lang['NONE'] => array()); + $avatar_list = array($user->lang['NO_AVATAR_CATEGORY'] => array()); } @ksort($avatar_list); diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 7f1c0b60fd..be4502e23e 100755 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -83,7 +83,7 @@ class mcp_reports $post_id = $report['post_id']; } - $post_info = get_post_data(array($post_id), 'm_approve'); + $post_info = get_post_data(array($post_id), 'm_report'); if (!sizeof($post_info)) { diff --git a/phpBB/install/index.php b/phpBB/install/index.php index a75c94295d..9a542dc2df 100755 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -624,7 +624,7 @@ class module case 'select': eval('$s_options = ' . str_replace('{VALUE}', $value, $options) . ';'); - $tpl = ''; + $tpl = ''; break; case 'custom': diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 4151857d54..f64bddceee 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -54,7 +54,7 @@ class install_install extends module 'TITLE' => $lang['INSTALL_INTRO'], 'BODY' => $lang['INSTALL_INTRO_BODY'], 'L_SUBMIT' => $lang['NEXT'], - 'S_LANG_SELECT' => '', + 'S_LANG_SELECT' => '', 'U_ACTION' => $this->p_master->module_url . "?mode=$mode&sub=requirements&language=$language", )); diff --git a/phpBB/install/install_main.php b/phpBB/install/install_main.php index 3b69a67cd7..cc8367f01b 100755 --- a/phpBB/install/install_main.php +++ b/phpBB/install/install_main.php @@ -70,7 +70,7 @@ class install_main extends module 'TITLE' => $title, 'BODY' => $body, - 'S_LANG_SELECT' => '', + 'S_LANG_SELECT' => '', )); } } diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index 29e622b2a7..4d49e1c8c3 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -106,8 +106,10 @@ $lang = array_merge($lang, array( 'NOT_ALLOWED_IN_PM' => 'Not allowed in private messages', 'NOT_ASSIGNED' => 'Not assigned', + 'NO_EXT_GROUP' => 'None', 'NO_EXT_GROUP_NAME' => 'No Group Name entered', 'NO_EXT_GROUP_SPECIFIED' => 'No Extension Group specified', + 'NO_FILE_CAT' => 'None', 'NO_IMAGE' => 'No Image', 'NO_THUMBNAIL_SUPPORT' => 'Thumbnail support has been disabled because there is no supported GD library available and the imagemagick executable could not be found.', 'NO_UPLOAD_DIR' => 'The upload directory you specified does not exist.', diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 983d49806d..e2fee6079e 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -208,6 +208,7 @@ $lang = array_merge($lang, array( $lang = array_merge($lang, array( 'ACP_VC_SETTINGS_EXPLAIN' => 'Here you are able to define visual confirmation defaults and captcha settings.', + 'BAD_POLICY' => 'The policy you selected is invalid.', 'CAPTCHA_3DBITMAP' => '3D Bitmap', 'CAPTCHA_CELLS' => 'Cells', 'CAPTCHA_COMPOSITE' => 'Composite', @@ -222,6 +223,9 @@ $lang = array_merge($lang, array( 'HEAVY' => 'Heavy', 'LIGHT' => 'Light', 'MEDIUM' => 'Medium', + 'NO_GD' => 'The server does not support GD, an extension required to enable the advanced CAPTCHA policies. A fall-back method will be used if you decide to enable Visual Confirmation features.', + 'NO_NOISE' => 'None', + 'NO_TTF' => 'The policy you selected requires TTF enabled, the server has TTF disabled. If this policy is enabled, it will be skipped and another policy will be used in its place. If no valid policies are enabled, a fall-back method will be used if you decide to enable Visual Confirmation features.', 'OVERLAP_NOISE_LINE' => 'Overlap line noise', 'OVERLAP_NOISE_PIXEL' => 'Overlap pixel noise', 'SHAPE_NOISE_LINE' => 'Shape line noise', @@ -230,9 +234,6 @@ $lang = array_merge($lang, array( 'VISUAL_CONFIRM_POST_EXPLAIN' => 'Requires anonymous users to enter a random code matching an image to help prevent mass postings.', 'VISUAL_CONFIRM_REG' => 'Enable visual confirmation for registrations', 'VISUAL_CONFIRM_REG_EXPLAIN' => 'Requires new users to enter a random code matching an image to help prevent mass registrations.', - 'NO_GD' => 'The server does not support GD, an extension required to enable the advanced CAPTCHA policies. A fall-back method will be used if you decide to enable Visual Confirmation features.', - 'NO_TTF' => 'The policy you selected requires TTF enabled, the server has TTF disabled. If this policy is enabled, it will be skipped and another policy will be used in its place. If no valid policies are enabled, a fall-back method will be used if you decide to enable Visual Confirmation features.', - 'BAD_POLICY' => 'The policy you selected is invalid.' )); // Cookie Settings @@ -347,6 +348,7 @@ $lang = array_merge($lang, array( 'IP_VALID_EXPLAIN' => 'Determines how much of the users IP is used to validate a session; All compares the complete address, A.B.C the first x.x.x, A.B the first x.x, None disables checking.', 'MAX_LOGIN_ATTEMPTS' => 'Maximum number of login attempts', 'MAX_LOGIN_ATTEMPTS_EXPLAIN' => 'After this number of failed logins the user needs to additionally confirm his login visually (visual confirmation)', + 'NO_IP_VALIDATION' => 'None', 'PASSWORD_TYPE' => 'Password complexity', 'PASSWORD_TYPE_EXPLAIN' => 'Determines how complex a password needs to be when set or altered, subsequent options include the previous ones.', 'PASS_TYPE_ALPHA' => 'Must contain alphanumerics', diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index 4819230026..f8dfe9419e 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -288,6 +288,7 @@ $lang = array_merge($lang, array( 'NO_UNINSTALLED_STYLE' => 'No uninstalled styles detected', 'NO_UNINSTALLED_TEMPLATE' => 'No uninstalled templates detected', 'NO_UNINSTALLED_THEME' => 'No uninstalled themes detected', + 'NO_UNIT' => 'None', 'ONLY_IMAGESET' => 'This is the only remaining imageset, you cannot delete it', 'ONLY_STYLE' => 'This is the only remaining style, you cannot delete it', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 18348278ab..fe753c50ac 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -299,7 +299,6 @@ $lang = array_merge($lang, array( 'NEXT' => 'Next', 'NEVER' => 'Never', 'NO' => 'No', - 'NONE' => 'None', 'NOT_AUTHORIZED' => 'You are not authorised to access this area.', 'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.', 'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.', @@ -324,6 +323,7 @@ $lang = array_merge($lang, array( 'NO_NEW_MESSAGES' => 'No new messages', 'NO_NEW_PM' => '0 new messages', 'NO_NEW_POSTS' => 'No new posts', + 'NO_ONLINE_USERS' => 'No registered users', 'NO_POSTS' => 'No posts', 'NO_SUCH_SEARCH_MODULE' => 'The specified search backend doesn\'t exist', 'NO_SUPPORTED_AUTH_METHODS' => 'No supported authentication methods', diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index 2db565acb2..5de6718550 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -208,6 +208,7 @@ $lang = array_merge($lang, array( 'NO_POST_REPORT' => 'This post was not reported.', 'NO_POST_SELECTED' => 'You must select at least one post to perform this action', 'NO_REASON_DISAPPROVAL' => 'Please give an appropiate reason for disapproval', + 'NO_TOPIC_ICON' => 'None', 'NO_TOPIC_SELECTED' => 'You must select at least one topic to perform this action', 'OTHER_IPS' => 'Other IP addresses this user has posted from', diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 7b38d34020..30ed20d2f2 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -124,6 +124,7 @@ $lang = array_merge($lang, array( 'NO_POLL_TITLE' => 'You have to enter a poll title', 'NO_POST' => 'The requested post does not exist.', 'NO_POST_MODE' => 'No post mode specified', + 'NO_TOPIC_ICON' => 'None', 'PARTIAL_UPLOAD' => 'The uploaded file was only partially uploaded', 'PHP_SIZE_NA' => 'The attachment\'s filesize is too large.
Could not determine the maximum size defined by PHP in php.ini.', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 9e6f8312d5..12a0b2c3f2 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -264,6 +264,7 @@ $lang = array_merge($lang, array( 'NOT_MOVED_MESSAGES' => 'You have %d private messages currently on hold because of full folder.', 'NO_ACTION_MODE' => 'No message action specified', 'NO_AUTHOR' => 'No author defined for this message', + 'NO_AVATAR_CATEGORY' => 'None', 'NO_AUTH_DELETE_MESSAGE' => 'You are not authorised to delete private messages.', 'NO_AUTH_EDIT_MESSAGE' => 'You are not authorised to edit private messages.', @@ -274,6 +275,7 @@ $lang = array_merge($lang, array( 'NO_AUTH_SEND_MESSAGE' => 'You are not authorised sending private messages.', 'NO_AUTH_SIGNATURE' => 'You are not authorised to define a signature', + 'NO_BCC_RECIPIENT' => 'None', 'NO_BOOKMARKS' => 'You have no bookmarks', 'NO_BOOKMARKS_SELECTED' => 'You have selected no bookmarks', 'NO_EMAIL_USER' => 'The email/username information submitted could not be found', @@ -290,6 +292,7 @@ $lang = array_merge($lang, array( 'NO_RECIPIENT' => 'No recipient defined', 'NO_RULES_DEFINED' => 'No rules defined', 'NO_SAVED_DRAFTS' => 'No drafts saved', + 'NO_TO_RECIPIENT' => 'None', 'NO_WATCHED_FORUMS' => 'You are not watching any forums.', 'NO_WATCHED_TOPICS' => 'You are not watching any topics.', diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 225d2927d3..2ace920917 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1331,7 +1331,17 @@ function show_profile($data) { $time = time() + $user->timezone + $user->dst; - $age = (int) (date('Y', $time) - $bday_year - ((date('n', $time) - $bday_month < 0) ? 1 : ((date('j', $time) - $bday_day < 0) ? 1 : 0))); + $diff = date('n', $time) - $bday_month; + if ($diff == 0) + { + $diff = (date('j', $time) - $bday_day < 0) ? 1 : 0; + } + else + { + $diff = ($diff < 0) ? 1 : 0; + } + + $age = (int) (date('Y', $time) - $bday_year - $diff); } } diff --git a/phpBB/styles/subSilver/template/mcp_topic.html b/phpBB/styles/subSilver/template/mcp_topic.html index f813ca5532..611bc4fe84 100644 --- a/phpBB/styles/subSilver/template/mcp_topic.html +++ b/phpBB/styles/subSilver/template/mcp_topic.html @@ -25,7 +25,7 @@ - +
checked="checked" />{L_NONE} checked="checked" /> checked="checked" />{L_NO_TOPIC_ICON} checked="checked" />
diff --git a/phpBB/styles/subSilver/template/posting_body.html b/phpBB/styles/subSilver/template/posting_body.html index f24171e5ad..d9924ddcc6 100644 --- a/phpBB/styles/subSilver/template/posting_body.html +++ b/phpBB/styles/subSilver/template/posting_body.html @@ -174,7 +174,7 @@ function checkForm() - +
{L_NONE} {L_NO_TOPIC_ICON}
@@ -196,7 +196,7 @@ function checkForm() class="blue">{to_recipient.NAME}   - {L_NONE} + {L_NO_TO_RECIPIENT} @@ -207,7 +207,7 @@ function checkForm() class="blue">{bcc_recipient.NAME}   - {L_NONE} + {L_NO_BCC_RECIPIENT} diff --git a/phpBB/styles/subSilver/template/ucp_profile_avatar.html b/phpBB/styles/subSilver/template/ucp_profile_avatar.html index d33c2a07f0..fb6d3e25f4 100644 --- a/phpBB/styles/subSilver/template/ucp_profile_avatar.html +++ b/phpBB/styles/subSilver/template/ucp_profile_avatar.html @@ -11,7 +11,10 @@ {L_CURRENT_IMAGE}:
{L_AVATAR_EXPLAIN} -
{AVATAR}

 {L_DELETE_AVATAR} +
+ {AVATAR}

 {L_DELETE_AVATAR} + + @@ -69,7 +72,7 @@ - + {S_HIDDEN_FIELDS}   diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 694f173268..43aca88ade 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1072,7 +1072,18 @@ while ($row = $db->sql_fetchrow($result)) if ($bday_year) { - $user_cache[$poster_id]['age'] = (int) ($today['year'] - $bday_year - (($today['month'] - $bday_month < 0) ? 1 : (($today['day'] - $bday_day < 0) ? 1 : 0))); + $diff = $today['month'] - $bday_month; + if ($diff == 0) + { + $diff = ($today['day'] - $bday_day < 0) ? 1 : 0; + } + else + { + $diff = ($diff < 0) ? 1 : 0; + } + + $age = (int) (date('Y', $time) - $bday_year - $diff); + $user_cache[$poster_id]['age'] = (int) ($today['year'] - $bday_year - $diff); } } }