diff --git a/upload/admin/admin_attachments.php b/upload/admin/admin_attachments.php index 720b59c44..848735d97 100644 --- a/upload/admin/admin_attachments.php +++ b/upload/admin/admin_attachments.php @@ -118,9 +118,10 @@ while ($row = DB()->sql_fetchrow($result)) { $value = trim($new_attach[$config_name]); - if ($value[strlen($value)-1] == '/') + if (strlen($value) && substr($value, -1) == '/') { - $value[strlen($value)-1] = ' '; + if(strlen($value)) $value = substr($value, 0, strlen($value)-1); + else $value = ''; } $new_attach[$config_name] = trim($value); diff --git a/upload/admin/index.php b/upload/admin/index.php index 59940e83b..d309ce13b 100644 --- a/upload/admin/index.php +++ b/upload/admin/index.php @@ -165,12 +165,12 @@ else if( isset($_GET['pane']) && $_GET['pane'] == 'right' ) } else { - $dbsize = $lang['Not_available']; + $dbsize = $lang['NOT_AVAILABLE']; } } else { - $dbsize = $lang['Not_available']; + $dbsize = $lang['NOT_AVAILABLE']; } $template->assign_vars(array( @@ -255,18 +255,10 @@ else if( isset($_GET['pane']) && $_GET['pane'] == 'right' ) "STARTED" => bb_date($onlinerow_reg[$i]['session_start'], 'H:i', 'false'), "LASTUPDATE" => bb_date($onlinerow_reg[$i]['user_session_time'], 'H:i', 'false'), "IP_ADDRESS" => $reg_ip, - - "U_WHOIS_IP" => "http://ip-whois.net/ip_geo.php?ip=$reg_ip", + "U_WHOIS_IP" => $bb_cfg['whois_info'] . $reg_ip, )); } } - - } - else - { - $template->assign_vars(array( - "L_NO_REGISTERED_USERS_BROWSING" => $lang['NO_USERS_BROWSING']) - ); } // @@ -287,11 +279,10 @@ else if( isset($_GET['pane']) && $_GET['pane'] == 'right' ) $template->assign_block_vars("guest_user_row", array( "ROW_CLASS" => $row_class, - "USERNAME" => $lang['GUEST'], "STARTED" => bb_date($onlinerow_guest[$i]['session_start'], 'H:i', 'false'), "LASTUPDATE" => bb_date($onlinerow_guest[$i]['session_time'], 'H:i' , 'false'), "IP_ADDRESS" => $guest_ip, - "U_WHOIS_IP" => "http://ip-whois.net/ip_geo.php?ip=$guest_ip", + "U_WHOIS_IP" => $bb_cfg['whois_info'] . $guest_ip, )); } } diff --git a/upload/ajax/mod_action.php b/upload/ajax/mod_action.php index ffb1369d2..2da57c3e7 100644 --- a/upload/ajax/mod_action.php +++ b/upload/ajax/mod_action.php @@ -111,12 +111,12 @@ switch ($mode)
- + - +
'. $lang['REG_IP'] .''.decode_ip($profiledata['user_reg_ip']).''.decode_ip($profiledata['user_reg_ip']).'
'. $link_reg_ip .'
'. $lang['LAST_IP'] .''.decode_ip($profiledata['user_last_ip']).''.decode_ip($profiledata['user_last_ip']).'
'. $link_last_ip .'

'; diff --git a/upload/config.php b/upload/config.php index f5c1bbfa6..b44a2b3b9 100644 --- a/upload/config.php +++ b/upload/config.php @@ -63,8 +63,8 @@ $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'] = 'R336'; -$bb_cfg['tp_release_date'] = '09-12-2011'; +$bb_cfg['tp_release_state'] = 'R337'; +$bb_cfg['tp_release_date'] = '17-12-2011'; // Database $charset = 'utf8'; @@ -580,4 +580,6 @@ $bb_cfg['latest_news_forum_id'] = '1'; // (string) 1,2,3... $bb_cfg['show_network_news'] = true; $bb_cfg['max_net_title'] = 50; $bb_cfg['network_news_count'] = 5; -$bb_cfg['network_news_forum_id'] = '2'; // (string) 1,2,3... \ No newline at end of file +$bb_cfg['network_news_forum_id'] = '2'; // (string) 1,2,3... + +$bb_cfg['whois_info'] = 'http://ip-whois.net/ip_geo.php?ip='; \ No newline at end of file diff --git a/upload/templates/admin/index.tpl b/upload/templates/admin/index.tpl index 99a717365..848cd62f4 100644 --- a/upload/templates/admin/index.tpl +++ b/upload/templates/admin/index.tpl @@ -160,7 +160,7 @@ table.forumline { margin: 0 auto; } - {reg_user_row.USER} + {reg_user_row.USER} {reg_user_row.STARTED}-{reg_user_row.LASTUPDATE} {reg_user_row.IP_ADDRESS} @@ -169,10 +169,10 @@ table.forumline { margin: 0 auto; } . - -  {guest_user_row.USERNAME}  -  {guest_user_row.STARTED}-{guest_user_row.LASTUPDATE}  -  {guest_user_row.IP_ADDRESS}  + + {L_GUEST} + {guest_user_row.STARTED}-{guest_user_row.LASTUPDATE} + {guest_user_row.IP_ADDRESS} diff --git a/upload/viewonline.php b/upload/viewonline.php index 65a58a27f..e066a2bf5 100644 --- a/upload/viewonline.php +++ b/upload/viewonline.php @@ -102,7 +102,7 @@ while ( $row = DB()->sql_fetchrow($result) ) 'LASTUPDATE' => bb_date($row['session_time']), 'LASTUPDATE_RAW' => $row['session_time'], 'USERIP' => $user_ip, - 'U_WHOIS_IP' => "http://ip-whois.net/ip_geo.php?ip=$user_ip", + 'U_WHOIS_IP' => $bb_cfg['whois_info'] . $user_ip, )); $which_counter++; diff --git a/upload/viewtopic.php b/upload/viewtopic.php index 1c1c7e2ed..46218a10d 100644 --- a/upload/viewtopic.php +++ b/upload/viewtopic.php @@ -830,13 +830,15 @@ for($i = 0; $i < $total_posts; $i++) { $poster_avatar = get_avatar($postrow[$i]['user_avatar'], $postrow[$i]['user_avatar_type'], !bf($postrow[$i]['user_opt'], 'user_opt', 'allow_avatar')); } + + $user_rank = $postrow[$i]['user_rank']; // // Generate ranks, set them to empty string initially. // $poster_rank = $rank_image = ''; - if (!$user->opt_js['h_rnk_i'] AND $user_rank = $postrow[$i]['user_rank'] AND isset($ranks[$user_rank])) + if (!$user->opt_js['h_rnk_i'] AND isset($ranks[$user_rank])) { $rank_image = ($bb_cfg['show_rank_image'] && $ranks[$user_rank]['rank_image']) ? '' : ''; $poster_rank = ($bb_cfg['show_rank_text']) ? $ranks[$user_rank]['rank_title'] : '';