diff options
Diffstat (limited to 'phpBB/includes')
-rw-r--r-- | phpBB/includes/acp/acp_board.php | 2 | ||||
-rw-r--r-- | phpBB/includes/acp/acp_email.php | 2 | ||||
-rw-r--r-- | phpBB/includes/acp/acp_forums.php | 4 | ||||
-rw-r--r-- | phpBB/includes/acp/acp_groups.php | 2 | ||||
-rw-r--r-- | phpBB/includes/acp/acp_main.php | 2 | ||||
-rw-r--r-- | phpBB/includes/acp/acp_modules.php | 8 | ||||
-rw-r--r-- | phpBB/includes/acp/acp_search.php | 2 | ||||
-rw-r--r-- | phpBB/includes/acp/acp_styles.php | 6 | ||||
-rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
-rw-r--r-- | phpBB/includes/functions_admin.php | 2 | ||||
-rw-r--r-- | phpBB/includes/functions_convert.php | 4 | ||||
-rw-r--r-- | phpBB/includes/functions_messenger.php | 2 | ||||
-rw-r--r-- | phpBB/includes/functions_posting.php | 2 | ||||
-rw-r--r-- | phpBB/includes/functions_privmsgs.php | 8 | ||||
-rw-r--r-- | phpBB/includes/functions_template.php | 4 | ||||
-rwxr-xr-x | phpBB/includes/search/fulltext_native.php | 2 | ||||
-rw-r--r-- | phpBB/includes/session.php | 4 | ||||
-rw-r--r-- | phpBB/includes/template.php | 2 | ||||
-rw-r--r-- | phpBB/includes/ucp/ucp_pm.php | 2 | ||||
-rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 2 |
20 files changed, 26 insertions, 38 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 4216464718..fa6b604c7b 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -153,7 +153,7 @@ class acp_board 'bump_interval' => array('lang' => 'BUMP_INTERVAL', 'validate' => 'int', 'type' => 'custom', 'method' => 'bump_interval', 'explain' => true), 'topics_per_page' => array('lang' => 'TOPICS_PER_PAGE', 'validate' => 'int', 'type' => 'text:3:4', 'explain' => false), 'posts_per_page' => array('lang' => 'POSTS_PER_PAGE', 'validate' => 'int', 'type' => 'text:3:4', 'explain' => false), - 'hot_threshold' => array('lang' => 'HOT_THRESHOLD', 'validate' => 'int', 'type' => 'text:3:4', 'explain' => false), + 'hot_threshold' => array('lang' => 'HOT_THRESHOLD', 'validate' => 'int', 'type' => 'text:3:4', 'explain' => true), 'max_poll_options' => array('lang' => 'MAX_POLL_OPTIONS', 'validate' => 'int', 'type' => 'text:4:4', 'explain' => false), 'max_post_chars' => array('lang' => 'CHAR_LIMIT', 'validate' => 'int', 'type' => 'text:4:6', 'explain' => true), 'max_post_smilies' => array('lang' => 'SMILIES_LIMIT', 'validate' => 'int', 'type' => 'text:4:4', 'explain' => true), diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 991b368a01..6b2904b245 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -38,7 +38,7 @@ class acp_email { // Error checking needs to go here ... if no subject and/or no message then skip // over the send and return to the form - $use_queue = (isset($_POST['send_immediatly'])) ? false : true; + $use_queue = (isset($_POST['send_immediately'])) ? false : true; $priority = request_var('mail_priority_flag', MAIL_NORMAL_PRIORITY); if (!$subject) diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 9b1388a13d..978587a650 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -403,10 +403,8 @@ class acp_forums } // Make sure no direct child forums are able to be selected as parents. - $childs = get_forum_branch($forum_id, 'children'); - $exclude_forums = array(); - foreach ($childs as $row) + foreach (get_forum_branch($forum_id, 'children') as $row) { $exclude_forums[] = $row['forum_id']; } diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 06761d0fac..7147431259 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -381,7 +381,7 @@ class acp_groups $group_perm_from = request_var('group_perm_from', 0); // Copy permissions? - // If the user has the a_authgroups permission and at least one additional permission ability set the permissions are fully transfered. + // If the user has the a_authgroups permission and at least one additional permission ability set the permissions are fully transferred. // We do not limit on one auth category because this can lead to incomplete permissions being tricky to fix for the admin, roles being assigned or added non-default permissions. // Since the user only has the option to copy permissions from non leader managed groups this seems to be a good compromise. if ($group_perm_from && $action == 'add' && $auth->acl_get('a_authgroups') && $auth->acl_gets('a_aauth', 'a_fauth', 'a_mauth', 'a_uauth')) diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index d7e327e4d3..fad9ad47b7 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -43,7 +43,7 @@ class acp_main 'S_RESTORE_PERMISSIONS' => true, 'U_RESTORE_PERMISSIONS' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm'), 'PERM_FROM' => $perm_from, - 'L_PERMISSIONS_TRANSFERED_EXPLAIN' => sprintf($user->lang['PERMISSIONS_TRANSFERED_EXPLAIN'], $perm_from, append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm')), + 'L_PERMISSIONS_TRANSFERRED_EXPLAIN' => sprintf($user->lang['PERMISSIONS_TRANSFERRED_EXPLAIN'], $perm_from, append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm')), )); return; diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index 24a9ed832f..2eb45b4972 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -1025,14 +1025,6 @@ class acp_modules return $this->lang_name($target['module_langname']); } - - /** - * Check if the module or her childs hold the management module(s) - */ - function is_management_module($module_id) - { - - } } ?>
\ No newline at end of file diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index 4dcb8876e1..1dfda1b684 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -532,7 +532,7 @@ class acp_search /** * Initialises a search backend object * - * @return false if no error occured else an error message + * @return false if no error occurred else an error message */ function init_search($type, &$search, &$error) { diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index b301f6d2ce..8dc09ca1db 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -2095,7 +2095,7 @@ parse_css_file = {PARSE_CSS_FILE} ); } - // User has submitted form and no errors have occured + // User has submitted form and no errors have occurred if ($update && !sizeof($error)) { $sql_ary = array( @@ -2558,7 +2558,7 @@ parse_css_file = {PARSE_CSS_FILE} $style_row['style_active'] = request_var('style_active', 1); $style_row['style_default'] = request_var('style_default', 0); - // User has submitted form and no errors have occured + // User has submitted form and no errors have occurred if ($update && !sizeof($error)) { if ($mode == 'style') @@ -2693,7 +2693,7 @@ parse_css_file = {PARSE_CSS_FILE} } } - // User has submitted form and no errors have occured + // User has submitted form and no errors have occurred if ($update && !sizeof($error)) { if ($mode == 'style') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index db34574b72..e3b7138189 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2115,7 +2115,7 @@ function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_po * @param string $words An array of words which should be contained in the result, has to be a valid part of a PCRE pattern (escape with preg_quote!) * @param int $length The desired length of the resulting text, however the result might be shorter or longer than this value * -* @return string Context of the specified words seperated by "..." +* @return string Context of the specified words separated by "..." */ function get_context($text, $words, $length = 400) { diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 4b40525881..31880d69cf 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2616,7 +2616,7 @@ function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port * Tidy Warnings * Remove all warnings which have now expired from the database * The duration of a warning can be defined by the administrator -* This only removes the warning and reduces the assosciated count, +* This only removes the warning and reduces the associated count, * it does not remove the user note recording the contents of the warning */ function tidy_warnings() diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index 85db5646b1..d4034d7019 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -301,7 +301,7 @@ function get_config_value($config_name) } /** -* Convert an IP address from the hexidecimal notation to normal dotted-quad notation +* Convert an IP address from the hexadecimal notation to normal dotted-quad notation */ function decode_ip($int_ip) { @@ -1207,7 +1207,7 @@ function update_folder_pm_count() $db->sql_freeresult($result); } -// Functions mainly used by the main converter script +// Functions mainly used by the main convertor script function path($path, $path_relative = true) { diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 8ee887e09b..1d96d5c4dd 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -982,7 +982,7 @@ class smtp_class { fputs($this->socket, $command . "\r\n"); - (!$private_info) ? $this->add_backtrace("# $command") : $this->add_backtrace('# Ommitting sensitive information'); + (!$private_info) ? $this->add_backtrace("# $command") : $this->add_backtrace('# Omitting sensitive information'); // We could put additional code here } diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index ef5afdecd8..62cdb99596 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -9,7 +9,7 @@ */ /** -* Fill smiley templates (or just the variables) with smileys, either in a window or inline +* Fill smiley templates (or just the variables) with smilies, either in a window or inline */ function generate_smilies($mode, $forum_id) { diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 9296d254e5..7677f4ba34 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -17,7 +17,7 @@ if (!defined('IN_PHPBB')) /* Ability to simply add own rules by doing three things: - 1) Add an appropiate constant + 1) Add an appropriate constant 2) Add a new check array to the global_privmsgs_rules variable and the condition array (if one is required) 3) Add a new language variable to ucp.php @@ -313,7 +313,7 @@ function check_rule(&$rules, &$rule_row, &$message_row, $user_id) } /** -* Place new messages into appropiate folder +* Place new messages into appropriate folder */ function place_pm_into_folder(&$global_privmsgs_rules, $release = false) { @@ -347,7 +347,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false) AND t.folder_id = " . PRIVMSGS_NO_BOX . ' AND t.msg_id = p.msg_id'; - // Just place into the appropiate arrays if no rules need to be checked + // Just place into the appropriate arrays if no rules need to be checked if (!$user_message_rules) { $result = $db->sql_query($retrieve_sql); @@ -420,7 +420,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false) $db->sql_freeresult($result); } - // Now place into the appropiate folder + // Now place into the appropriate folder foreach ($check_rows as $row) { // Add membership if set diff --git a/phpBB/includes/functions_template.php b/phpBB/includes/functions_template.php index 3c7259fe0a..e7ef24a49a 100644 --- a/phpBB/includes/functions_template.php +++ b/phpBB/includes/functions_template.php @@ -112,7 +112,7 @@ class template_compile // if they wish to display < and > $this->remove_php_tags($code); - // Pull out all block/statement level elements and seperate plain text + // Pull out all block/statement level elements and separate plain text preg_match_all('#<!-- PHP -->(.*?)<!-- ENDPHP -->#s', $code, $matches); $php_blocks = $matches[1]; $code = preg_replace('#<!-- PHP -->.*?<!-- ENDPHP -->#s', '<!-- PHP -->', $code); @@ -209,7 +209,7 @@ class template_compile $template_php .= (!$no_echo) ? ((!empty($trim_check_text)) ? $text_blocks[$i] : '') . ((!empty($compile_blocks[$i])) ? $compile_blocks[$i] : '') : ((!empty($trim_check_text)) ? $text_blocks[$i] : '') . ((!empty($compile_blocks[$i])) ? $compile_blocks[$i] : ''); } - // There will be a number of occassions where we switch into and out of + // There will be a number of occasions where we switch into and out of // PHP mode instantaneously. Rather than "burden" the parser with this // we'll strip out such occurences, minimising such switching $template_php = str_replace(' ?><?php ', ' ', $template_php); diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php index 652495e734..d69db23747 100755 --- a/phpBB/includes/search/fulltext_native.php +++ b/phpBB/includes/search/fulltext_native.php @@ -166,7 +166,7 @@ class fulltext_native extends search_backend $keywords = preg_replace($match, $replace, $keywords); - // $keywords input format: each word seperated by a space, words in a bracket are not seperated + // $keywords input format: each word separated by a space, words in a bracket are not separated // the user wants to search for any word, convert the search query if ($terms == 'any') diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index dcc60f88b2..64f054ed74 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -433,7 +433,7 @@ class session $db->sql_freeresult($result); } - // If no data was returned one or more of the following occured: + // If no data was returned one or more of the following occurred: // Key didn't match one in the DB // User does not exist // User is inactive @@ -1446,7 +1446,7 @@ class user extends session // $lang == $this->lang // $help == $this->help - // - add appropiate variables here, name them as they are used within the language file... + // - add appropriate variables here, name them as they are used within the language file... if (!$use_db) { if ((include($this->lang_path . (($use_help) ? 'help_' : '') . "$lang_file.$phpEx")) === false) diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php index a2e04e4ab4..259874488d 100644 --- a/phpBB/includes/template.php +++ b/phpBB/includes/template.php @@ -473,7 +473,7 @@ class template } /** - * Include a seperate template + * Include a separate template * @access private */ function _tpl_include($filename, $include = true) diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php index b9c069e47e..b1f016e149 100644 --- a/phpBB/includes/ucp/ucp_pm.php +++ b/phpBB/includes/ucp/ucp_pm.php @@ -239,7 +239,7 @@ class ucp_pm handle_mark_actions($user->data['user_id'], $mark_option); } - // If new messages arrived, place them into the appropiate folder + // If new messages arrived, place them into the appropriate folder $num_not_moved = $num_removed = 0; if ($user->data['user_new_privmsg'] && $action == 'view_folder') diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 714f5ec0aa..ce6087f424 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -574,8 +574,6 @@ function compose_pm($id, $mode, $action) // Preview if (!sizeof($error) && $preview) { - $post_time = ($action == 'edit') ? $post_time : $current_time; - $preview_message = $message_parser->format_display($enable_bbcode, $enable_urls, $enable_smilies, false); $preview_signature = $user->data['user_sig']; |