diff --git a/include/functions.php b/include/functions.php index 08125a5..f5b6f61 100755 --- a/include/functions.php +++ b/include/functions.php @@ -5698,8 +5698,9 @@ function salary($total_num, $total_size, $standard_num, $standard_size) // ***********************************************//判断TJUIP function check_tjuip($nip) { + static $nontjuip = null; global $Cache; - $nontjuip = $Cache->get_value('nontjuip'); + empty($nontjuip) && $nontjuip = $Cache->get_value('nontjuip'); if (!$nontjuip) { $nontjuip = array(); $res = sql_query("SELECT * FROM nontjuip"); diff --git a/lang/chs/lang_viewpeerlist.php b/lang/chs/lang_viewpeerlist.php index 29c7049..e9a053d 100755 --- a/lang/chs/lang_viewpeerlist.php +++ b/lang/chs/lang_viewpeerlist.php @@ -30,6 +30,12 @@ 'col_client' => "客户端", + 'text_ipv4_in' => '校内IPV4', + + 'text_ipv4_out' => '校外IPV4', + + 'text_ipv6' => 'IPV4', + 'text_anonymous' => "匿名", 'text_unknown' => "(未知)", diff --git a/lang/cht/lang_viewpeerlist.php b/lang/cht/lang_viewpeerlist.php index bec8c0f..ff41dce 100755 --- a/lang/cht/lang_viewpeerlist.php +++ b/lang/cht/lang_viewpeerlist.php @@ -14,6 +14,9 @@ 'col_connected' => "連接時間", 'col_idle' => "最近匯報", 'col_client' => "用戶端", + 'text_ipv4_in' => '校內IPV4', + 'text_ipv4_out' => '校外IPV4', + 'text_ipv6' => 'IPV6', 'text_anonymous' => "匿名", 'text_unknown' => "(未知)", 'text_seeders' => "做種者", diff --git a/lang/en/lang_viewpeerlist.php b/lang/en/lang_viewpeerlist.php index e5c7512..62e8572 100755 --- a/lang/en/lang_viewpeerlist.php +++ b/lang/en/lang_viewpeerlist.php @@ -14,6 +14,9 @@ 'col_connected' => "Connected", 'col_idle' => "Idle", 'col_client' => "Client", + 'text_ipv4_in' => 'IPV4(School)', + 'text_ipv4_out' => 'IPV4', + 'text_ipv6' => 'IPV6', 'text_anonymous' => "Anonymous", 'text_unknown' => "(unknown)", 'text_seeders' => "Seeders", diff --git a/viewpeerlist.php b/viewpeerlist.php index fabdf6b..348f31e 100644 --- a/viewpeerlist.php +++ b/viewpeerlist.php @@ -46,7 +46,7 @@ function dltable($name, $arr, $torrent) /* ($enablelocation_tweak == 'yes' || get_user_class() >= $userprofile_class ? "".$lang_viewpeerlist['col_location']."" : "".$lang_viewpeerlist['ip_type']."").*/ ($enablelocation_tweak == 'yes' || get_user_class() >= $userprofile_class ? "" . $lang_viewpeerlist['col_location'] . "" : "") . - // "".$lang_viewpeerlist['col_connectable']."". + "" . $lang_viewpeerlist['col_connectable'] . "". "" . $lang_viewpeerlist['col_uploaded'] . "" . @@ -123,8 +123,21 @@ function dltable($name, $arr, $torrent) }*/ + $arrConn = []; + if (!empty($e["ipv4"])){ + if (check_tjuip($e["ipv4"])){ + $arrConn[] = $lang_viewpeerlist['text_ipv4_in']; + }else{ + $arrConn[] = $lang_viewpeerlist['text_ipv4_out']; + } + } + if (!empty($e["ipv6"])){ + $arrConn[] = $lang_viewpeerlist['text_ipv6']; + } + empty($arrConn) && $arrConn[] = $lang_viewpeerlist['text_unknown']; + - // $s .= "" .$lang_viewpeerlist[$e['connectable']] . "\n"; + $s .= "" . implode('/', $arrConn) . "\n"; $s .= "" . mksize($e["uploaded"]) . "\n";