From 417dace9b06b7de5a30e88ef3b1a737d7a9413f4 Mon Sep 17 00:00:00 2001 From: pherum83 Date: Mon, 5 Dec 2011 03:40:02 +0000 Subject: [PATCH] r334 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit IP юзера в профиле, удаление условия SHOW_ADMIN_OPTIONS git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@334 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- upload/ajax.php | 7 +-- upload/ajax/mod_action.php | 60 ++++++++++++++++++- upload/config.php | 2 +- upload/includes/page_header.php | 1 - upload/language/lang_english/lang_main.php | 4 ++ upload/language/lang_russian/lang_main.php | 4 ++ upload/templates/default/index.tpl | 4 +- .../templates/default/usercp_viewprofile.tpl | 30 ++++++++-- upload/templates/default/viewonline.tpl | 2 +- upload/templates/default/viewtopic.tpl | 2 +- 10 files changed, 100 insertions(+), 16 deletions(-) diff --git a/upload/ajax.php b/upload/ajax.php index ec5d46bd9..aca35fe91 100644 --- a/upload/ajax.php +++ b/upload/ajax.php @@ -67,6 +67,7 @@ class ajax_common 'edit_user_profile' => array('admin'), 'change_user_rank' => array('admin'), 'change_user_opt' => array('admin'), + 'manage_user' => array('admin'), 'change_tor_status' => array('mod'), 'mod_action' => array('mod'), @@ -74,16 +75,14 @@ class ajax_common 'gen_passkey' => array('user'), 'change_torrent' => array('user'), - 'manage_user' => array('user'), + 'change_tz' => array('user'), 'view_post' => array('guest'), 'view_torrent' => array('guest'), 'user_register' => array('guest'), 'posts' => array('guest'), 'birthday_list' => array('guest'), - 'get_forum_mods' => array('guest'), - - 'change_tz' => array('user'), + 'get_forum_mods' => array('guest'), ); var $action = null; diff --git a/upload/ajax/mod_action.php b/upload/ajax/mod_action.php index c8f7be906..ffb1369d2 100644 --- a/upload/ajax/mod_action.php +++ b/upload/ajax/mod_action.php @@ -51,7 +51,8 @@ switch ($mode) if(isset($news_forums[$t_data['forum_id']]) && $bb_cfg['show_latest_news']) { $datastore->enqueue('latest_news'); - $datastore->update('latest_news'); } + $datastore->update('latest_news'); + } $net_forums = array_flip(explode(',', $bb_cfg['network_news_forum_id'])); if(isset($net_forums[$t_data['forum_id']]) && $bb_cfg['show_network_news']) @@ -63,4 +64,61 @@ switch ($mode) $this->response['topic_id'] = $topic_id; $this->response['topic_title'] = $new_title; break; + + case 'profile_ip': + $user_id = (int) $this->request['user_id']; + $profiledata = get_userdata($user_id); + + if(!$user_id) $this->ajax_die($lang['NO_USER_ID_SPECIFIED']); + + $reg_ip = DB()->fetch_rowset("SELECT username, user_id, user_rank FROM ". BB_USERS ." + WHERE user_reg_ip = '{$profiledata['user_reg_ip']}' + AND user_reg_ip != '' + AND user_id != {$profiledata['user_id']} + ORDER BY username ASC"); + + $last_ip = DB()->fetch_rowset("SELECT username, user_id, user_rank FROM " .BB_USERS ." + WHERE user_last_ip = '{$profiledata['user_last_ip']}' + AND user_last_ip != '' + AND user_id != {$profiledata['user_id']}"); + + $link_reg_ip = $link_last_ip = ''; + + if(!empty($reg_ip)) + { + $link_reg_ip .= $lang['OTHER_IP'] .' '; + foreach ($reg_ip as $row) + { + $link_reg_ip .= profile_url($row) .' '; + } + } + + if(!empty($last_ip)) + { + $link_last_ip .= $lang['OTHER_IP'] .' '; + foreach ($last_ip as $row) + { + $link_last_ip .= profile_url($row) .' '; + } + } + + $this->response['ip_list_html'] = ' + +
+ + + + + + + + + + +
'. $lang['REG_IP'] .''.decode_ip($profiledata['user_reg_ip']).'
'. $link_reg_ip .'
'. $lang['LAST_IP'] .''.decode_ip($profiledata['user_last_ip']).'
'. $link_last_ip .'

'; + break; } diff --git a/upload/config.php b/upload/config.php index e66576b0c..494986c0d 100644 --- a/upload/config.php +++ b/upload/config.php @@ -63,7 +63,7 @@ $bb_cfg = $tr_cfg = $page_cfg = array(); // Increase number of revision after update $bb_cfg['tp_version'] = '2.4 (beta)'; -$bb_cfg['tp_release_state'] = 'R333'; +$bb_cfg['tp_release_state'] = 'R334'; $bb_cfg['tp_release_date'] = '05-12-2011'; // Database diff --git a/upload/includes/page_header.php b/upload/includes/page_header.php index caede17cb..9e2e8bde0 100644 --- a/upload/includes/page_header.php +++ b/upload/includes/page_header.php @@ -230,7 +230,6 @@ $template->assign_vars(array( 'U_TRACKER' => "tracker.php", 'U_GALLERY' => "gallery.php", - 'SHOW_ADMIN_OPTIONS' => $is_admin, 'SHOW_SIDEBAR1' => (!empty($page_cfg['show_sidebar1'][BB_SCRIPT]) || $bb_cfg['show_sidebar1_on_every_page']), 'SHOW_SIDEBAR2' => (!empty($page_cfg['show_sidebar2'][BB_SCRIPT]) || $bb_cfg['show_sidebar2_on_every_page']), diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index 4b2aa09d3..ce3d8681e 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -1379,6 +1379,10 @@ $lang['ONLY_FOR_SUPER_ADMIN'] = 'This option only for super admins'; $lang['ACCESS'] = 'Access'; $lang['ACCESS_SRV_LOAD'] = 'Depend on server load'; $lang['LOGS'] = 'Topic history'; + +$lang['LAST_IP'] = 'Last IP:'; +$lang['REG_IP'] = 'Registration IP:'; +$lang['OTHER_IP'] = 'Other IP:'; $lang['ALREADY_REG_IP'] = 'With your IP-address is already registered user %s. If you have not previously registered on our tracker, mail to Administrator'; // diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index 23db54685..f217c2423 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -1387,6 +1387,10 @@ $lang['ONLY_FOR_SUPER_ADMIN'] = 'Эта опция доступна только $lang['ACCESS'] = 'Доступ'; $lang['ACCESS_SRV_LOAD'] = 'Зависит от загрузки сервера'; $lang['LOGS'] = 'История темы'; + +$lang['LAST_IP'] = 'Последний IP:'; +$lang['REG_IP'] = 'IP регистрации:'; +$lang['OTHER_IP'] = 'Другие IP:'; $lang['ALREADY_REG_IP'] = 'С вашего IP-адреса уже зарегистрирован пользователь %s. Если Вы ранее не регистрировались на нашем сайте, обратитесь к Администрации'; // diff --git a/upload/templates/default/index.tpl b/upload/templates/default/index.tpl index 862545a97..85cbac7eb 100644 --- a/upload/templates/default/index.tpl +++ b/upload/templates/default/index.tpl @@ -191,11 +191,11 @@
-

{TOTAL_USERS_ONLINE}  {USERS_ONLINE_COUNTS}

+

{TOTAL_USERS_ONLINE}  {USERS_ONLINE_COUNTS}

{RECORD_USERS}

- +
{LOGGED_IN_USER_LIST}
diff --git a/upload/templates/default/usercp_viewprofile.tpl b/upload/templates/default/usercp_viewprofile.tpl index a680aed63..60d3da591 100644 --- a/upload/templates/default/usercp_viewprofile.tpl +++ b/upload/templates/default/usercp_viewprofile.tpl @@ -1,4 +1,4 @@ - + - + + + + + + +

{L_VIEWING_PROFILE}

@@ -223,7 +239,8 @@ ajax.callback.manage_user = function(data) { {LAST_VISIT_TIME} - + + {L_LAST_ACTIVITY}: {LAST_ACTIVITY_TIME} @@ -235,6 +252,7 @@ ajax.callback.manage_user = function(data) { [ {L_SEARCH_USER_POSTS} ] [ {L_SEARCH_USER_TOPICS} ] [ {L_SEARCH_RELEASES} ] + [ {L_IP_ADDRESS} ] [ {L_USER_DELETE} ]

@@ -294,9 +312,11 @@ ajax.callback.manage_user = function(data) { {L_ACCESS}: {L_ACCESS_SRV_LOAD}: {IGNORE_SRV_LOAD} - + + + diff --git a/upload/templates/default/viewonline.tpl b/upload/templates/default/viewonline.tpl index 81d139218..e7b299c18 100644 --- a/upload/templates/default/viewonline.tpl +++ b/upload/templates/default/viewonline.tpl @@ -26,7 +26,7 @@ {guest_user_row.USER} {guest_user_row.LASTUPDATE} - {guest_user_row.USERIP} + {guest_user_row.USERIP} diff --git a/upload/templates/default/viewtopic.tpl b/upload/templates/default/viewtopic.tpl index 9e9dc4b2e..a8998e9ff 100644 --- a/upload/templates/default/viewtopic.tpl +++ b/upload/templates/default/viewtopic.tpl @@ -463,7 +463,7 @@ $(document).ready(function(){
{S_TOPIC_ADMIN}
- +
Admin:  {L_LOGS}