增加对peer的ipv4校内外/ipv6的前端提示

haig233 · May 16, 2019 · f04eade · f04eade
1 parent 0c14ff9
commit f04eade
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -46,7 +46,7 @@ function dltable($name, $arr, $torrent)
             /*	($enablelocation_tweak == 'yes' || get_user_class() >= $userprofile_class ? "<td class=colhead align=center width=1%>".$lang_viewpeerlist['col_location']."</td>" : "<td class=colhead align=center width=1%>".$lang_viewpeerlist['ip_type']."</td>").*/
             ($enablelocation_tweak == 'yes' || get_user_class() >= $userprofile_class ? "<td class=colhead align=center width=1%>" . $lang_viewpeerlist['col_location'] . "</td>" : "") .
 
-            // "<td class=colhead align=center width=1%>".$lang_viewpeerlist['col_connectable']."</td>".
+            "<td class=colhead align=center width=1%>" . $lang_viewpeerlist['col_connectable'] . "</td>".
 
             "<td class=colhead align=center width=1%>" . $lang_viewpeerlist['col_uploaded'] . "</td>" .
 
@@ -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 .= "<td class=rowfollow align=center width=1%><nobr>" .$lang_viewpeerlist[$e['connectable']] . "</nobr></td>\n";
+            $s .= "<td class=rowfollow align=center width=1%><nobr>" . implode('/', $arrConn) . "</nobr></td>\n";
 
             $s .= "<td class=rowfollow align=center width=1%><nobr>" . mksize($e["uploaded"]) . "</nobr></td>\n";