diff options
Diffstat (limited to 'phpBB/includes/acp')
-rw-r--r-- | phpBB/includes/acp/acp_attachments.php | 2 | ||||
-rw-r--r-- | phpBB/includes/acp/acp_email.php | 2 | ||||
-rw-r--r-- | phpBB/includes/acp/acp_groups.php | 6 | ||||
-rw-r--r-- | phpBB/includes/acp/acp_icons.php | 2 | ||||
-rw-r--r-- | phpBB/includes/acp/acp_main.php | 4 | ||||
-rw-r--r-- | phpBB/includes/acp/acp_profile.php | 18 | ||||
-rw-r--r-- | phpBB/includes/acp/acp_reasons.php | 4 | ||||
-rw-r--r-- | phpBB/includes/acp/acp_search.php | 2 | ||||
-rw-r--r-- | phpBB/includes/acp/acp_users.php | 6 | ||||
-rw-r--r-- | phpBB/includes/acp/acp_words.php | 2 |
10 files changed, 24 insertions, 24 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index 2c5f04faf1..e316a0f926 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -519,7 +519,7 @@ class acp_attachments FROM ' . EXTENSION_GROUPS_TABLE . " WHERE group_id = $group_id"; $result = $db->sql_query($sql); - $group_name = $db->sql_fetchfield('group_name', 0, $result); + $group_name = (string) $db->sql_fetchfield('group_name'); $db->sql_freeresult($result); $sql = 'DELETE diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index b870a451db..03ed3b4696 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -174,7 +174,7 @@ class acp_email FROM ' . GROUPS_TABLE . " WHERE group_id = $group_id"; $result = $db->sql_query($sql); - $group_name = (string) $db->sql_fetchfield('group_name', 0, $result); + $group_name = (string) $db->sql_fetchfield('group_name'); $db->sql_freeresult($result); } else diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 644f4f7cf9..75fc125920 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -488,8 +488,7 @@ class acp_groups WHERE group_id = $group_id AND group_leader = 1"; $result = $db->sql_query($sql); - - $total_leaders = (int) $db->sql_fetchfield('total_leaders', 0, $result); + $total_leaders = (int) $db->sql_fetchfield('total_leaders'); $db->sql_freeresult($result); // Total number of group members (non-leaders) @@ -498,8 +497,7 @@ class acp_groups WHERE group_id = $group_id AND group_leader <> 1"; $result = $db->sql_query($sql); - - $total_members = (int) $db->sql_fetchfield('total_members', 0, $result); + $total_members = (int) $db->sql_fetchfield('total_members'); $db->sql_freeresult($result); // Grab the members diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index 7b683186ee..f269c0027d 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -271,7 +271,7 @@ class acp_icons $result = $db->sql_query("SELECT {$fields}_order FROM $table WHERE {$fields}_id = " . $image_id[$image]); - $order_old = $db->sql_fetchfield($fields . '_order', 0, $result); + $order_old = (int) $db->sql_fetchfield($fields . '_order'); $db->sql_freeresult($result); if ($order_old == $image_order[$image]) diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 9c1c32fb24..cd692c22de 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -190,14 +190,14 @@ class acp_main FROM ' . ATTACHMENTS_TABLE; $result = $db->sql_query($sql); - set_config('num_files', (int) $db->sql_fetchfield('stat', 0, $result), true); + set_config('num_files', (int) $db->sql_fetchfield('stat'), true); $db->sql_freeresult($result); $sql = 'SELECT SUM(filesize) as stat FROM ' . ATTACHMENTS_TABLE; $result = $db->sql_query($sql); - set_config('upload_dir_size', (int) $db->sql_fetchfield('stat', 0, $result), true); + set_config('upload_dir_size', (int) $db->sql_fetchfield('stat'), true); $db->sql_freeresult($result); add_log('admin', 'LOG_RESYNC_STATS'); diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php index 6e19c0d09c..804bbb8792 100644 --- a/phpBB/includes/acp/acp_profile.php +++ b/phpBB/includes/acp/acp_profile.php @@ -99,7 +99,7 @@ class acp_profile FROM ' . PROFILE_FIELDS_TABLE . " WHERE field_id = $field_id"; $result = $db->sql_query($sql); - $field_ident = $db->sql_fetchfield('field_ident', 0, $result); + $field_ident = (string) $db->sql_fetchfield('field_ident'); $db->sql_freeresult($result); $db->sql_query('DELETE FROM ' . PROFILE_FIELDS_TABLE . " WHERE field_id = $field_id"); @@ -152,9 +152,9 @@ class acp_profile $sql = 'SELECT lang_id FROM ' . LANG_TABLE . " - WHERE lang_iso = '{$config['default_lang']}'"; + WHERE lang_iso = '" . $db->sql_escape($config['default_lang']) . "'"; $result = $db->sql_query($sql); - $default_lang_id = (int) $db->sql_fetchfield('lang_id', 0, $result); + $default_lang_id = (int) $db->sql_fetchfield('lang_id'); $db->sql_freeresult($result); if (!in_array($default_lang_id, $lang_defs['entry'][$field_id])) @@ -171,7 +171,7 @@ class acp_profile FROM ' . PROFILE_FIELDS_TABLE . " WHERE field_id = $field_id"; $result = $db->sql_query($sql); - $field_ident = $db->sql_fetchfield('field_ident', 0, $result); + $field_ident = (string) $db->sql_fetchfield('field_ident'); $db->sql_freeresult($result); add_log('admin', 'LOG_PROFILE_FIELD_ACTIVATE', $field_ident); @@ -196,7 +196,7 @@ class acp_profile FROM ' . PROFILE_FIELDS_TABLE . " WHERE field_id = $field_id"; $result = $db->sql_query($sql); - $field_ident = $db->sql_fetchfield('field_ident', 0, $result); + $field_ident = (string) $db->sql_fetchfield('field_ident'); $db->sql_freeresult($result); add_log('admin', 'LOG_PROFILE_FIELD_DEACTIVATE', $field_ident); @@ -915,10 +915,12 @@ class acp_profile if ($action == 'create') { - $result = $db->sql_query('SELECT MAX(field_order) as max_field_order FROM ' . PROFILE_FIELDS_TABLE); - $new_field_order = (int) $db->sql_fetchfield('max_field_order', 0, $result); + $sql = 'SELECT MAX(field_order) as max_field_order + FROM ' . PROFILE_FIELDS_TABLE; + $result = $db->sql_query($sql); + $new_field_order = (int) $db->sql_fetchfield('max_field_order'); $db->sql_freeresult($result); - + $field_ident = $cp->vars['field_ident']; } diff --git a/phpBB/includes/acp/acp_reasons.php b/phpBB/includes/acp/acp_reasons.php index 8866a762e6..890350f26b 100644 --- a/phpBB/includes/acp/acp_reasons.php +++ b/phpBB/includes/acp/acp_reasons.php @@ -97,7 +97,7 @@ class acp_reasons $sql = 'SELECT MAX(reason_order) as max_reason_order FROM ' . REASONS_TABLE; $result = $db->sql_query($sql); - $max_order = (int) $db->sql_fetchfield('max_reason_order', 0, $result); + $max_order = (int) $db->sql_fetchfield('max_reason_order'); $db->sql_freeresult($result); $sql_ary = array( @@ -191,7 +191,7 @@ class acp_reasons FROM ' . REASONS_TABLE . " WHERE reason_title = 'other'"; $result = $db->sql_query($sql); - $other_reason_id = (int) $db->sql_fetchfield('reason_id', 0, $result); + $other_reason_id = (int) $db->sql_fetchfield('reason_id'); $db->sql_freeresult($result); // Change the reports using this reason to 'other' diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index 3b6f935b9e..3daba4e4d5 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -452,7 +452,7 @@ class acp_search $sql = 'SELECT MAX(post_id) as max_post_id FROM '. POSTS_TABLE; $result = $db->sql_query($sql); - $max_post_id = (int) $db->sql_fetchfield('max_post_id', 0, $result); + $max_post_id = (int) $db->sql_fetchfield('max_post_id'); $db->sql_freeresult($result); return $max_post_id; diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 653c33f5da..f72c6d3310 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -81,7 +81,7 @@ class acp_users FROM ' . USERS_TABLE . " WHERE username = '" . $db->sql_escape($username) . "'"; $result = $db->sql_query($sql); - $user_id = (int) $db->sql_fetchfield('user_id', false, $result); + $user_id = (int) $db->sql_fetchfield('user_id'); $db->sql_freeresult($result); if (!$user_id) @@ -1560,11 +1560,11 @@ class acp_users $order_by = $sk_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC'); - $sql = 'SELECT COUNT(*) as num_attachments + $sql = 'SELECT COUNT(attach_id) as num_attachments FROM ' . ATTACHMENTS_TABLE . " WHERE poster_id = $user_id"; $result = $db->sql_query_limit($sql, 1); - $num_attachments = (int) $db->sql_fetchfield('num_attachments', false, $result); + $num_attachments = (int) $db->sql_fetchfield('num_attachments'); $db->sql_freeresult($result); $sql = 'SELECT a.*, t.topic_title, p.message_subject as message_title diff --git a/phpBB/includes/acp/acp_words.php b/phpBB/includes/acp/acp_words.php index d7f1a9d724..bea148b057 100644 --- a/phpBB/includes/acp/acp_words.php +++ b/phpBB/includes/acp/acp_words.php @@ -114,7 +114,7 @@ class acp_words FROM ' . WORDS_TABLE . " WHERE word_id = $word_id"; $result = $db->sql_query($sql); - $deleted_word = $db->sql_fetchfield('word', 0, $result); + $deleted_word = $db->sql_fetchfield('word'); $db->sql_freeresult($result); $sql = 'DELETE FROM ' . WORDS_TABLE . " |