From 9841f6145c88a30d1d337a4e250ac379ac9b2700 Mon Sep 17 00:00:00 2001 From: Bart van Bragt Date: Wed, 2 Feb 2005 13:14:46 +0000 Subject: Missing UCP language string, some small activation issues on adm/index.php git-svn-id: file:///svn/phpbb/trunk@5090 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/index.php | 14 +++++++++----- phpBB/language/en/ucp.php | 3 ++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index e94f027064..46054fa74b 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -148,11 +148,11 @@ elseif ($pane == 'right') if (!$delete) { - set_config('num_users', $config['num_users'] + $db->affected_rows(), true); + set_config('num_users', $config['num_users'] + $db->sql_affectedrows(), true); } $log_action = ($activate) ? 'log_index_activate' : 'log_index_delete'; - add_log('admin', $log_action, $db->affected_rows()); + add_log('admin', $log_action, $db->sql_affectedrows()); break; case 'remind': @@ -166,7 +166,7 @@ elseif ($pane == 'right') trigger_error($user->lang['EMAIL_DISABLED']); } - $sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_method, user_regdate, user_actkey + $sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type, user_regdate, user_actkey FROM ' . USERS_TABLE . " WHERE user_id IN ($mark)"; $result = $db->sql_query($sql); @@ -205,7 +205,11 @@ elseif ($pane == 'right') } while ($row = $db->sql_fetchrow($result)); - $messenger->queue->save(); + if ($messenger->queue) + { + $messenger->queue->save(); + } + unset($email_list); add_log('admin', 'LOG_INDEX_REMIND', implode(', ', $usernames)); @@ -705,4 +709,4 @@ else exit; } -?> \ No newline at end of file +?> diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index cb9f684700..ffd5d7719c 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -341,6 +341,7 @@ $lang += array( 'UCP_AVATAR' => 'Your avatar', 'UCP_PROFILE_INFO' => 'Your Profile', 'UCP_REG_DETAILS' => 'Registration details', + 'UCP_REGISTER_DISABLE' => 'Creating a new account is currently not possible.', 'UCP_SIGNATURE' => 'Your signature', 'UCP_REMIND' => 'Send password', 'UCP_WATCHED' => 'Watched items', @@ -446,4 +447,4 @@ $lang += array( 'JOIN_MARKED' => 'Join marked', ); -?> \ No newline at end of file +?> -- cgit v1.2.1