|
@@ -46,6 +46,7 @@ func (s *SubService) GetSubs(subId string, host string) ([]string, int64, xray.C
|
|
|
var result []string
|
|
var result []string
|
|
|
var traffic xray.ClientTraffic
|
|
var traffic xray.ClientTraffic
|
|
|
var lastOnline int64
|
|
var lastOnline int64
|
|
|
|
|
+ var hasEnabledClient bool
|
|
|
var clientTraffics []xray.ClientTraffic
|
|
var clientTraffics []xray.ClientTraffic
|
|
|
inbounds, err := s.getInboundsBySubId(subId)
|
|
inbounds, err := s.getInboundsBySubId(subId)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -78,6 +79,9 @@ func (s *SubService) GetSubs(subId string, host string) ([]string, int64, xray.C
|
|
|
}
|
|
}
|
|
|
for _, client := range clients {
|
|
for _, client := range clients {
|
|
|
if client.SubID == subId {
|
|
if client.SubID == subId {
|
|
|
|
|
+ if client.Enable {
|
|
|
|
|
+ hasEnabledClient = true
|
|
|
|
|
+ }
|
|
|
link := s.getLink(inbound, client.Email)
|
|
link := s.getLink(inbound, client.Email)
|
|
|
result = append(result, link)
|
|
result = append(result, link)
|
|
|
ct := s.getClientTraffics(inbound.ClientStats, client.Email)
|
|
ct := s.getClientTraffics(inbound.ClientStats, client.Email)
|
|
@@ -111,6 +115,7 @@ func (s *SubService) GetSubs(subId string, host string) ([]string, int64, xray.C
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ traffic.Enable = hasEnabledClient
|
|
|
return result, lastOnline, traffic, nil
|
|
return result, lastOnline, traffic, nil
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1304,6 +1309,7 @@ type PageData struct {
|
|
|
Host string
|
|
Host string
|
|
|
BasePath string
|
|
BasePath string
|
|
|
SId string
|
|
SId string
|
|
|
|
|
+ Enabled bool
|
|
|
Download string
|
|
Download string
|
|
|
Upload string
|
|
Upload string
|
|
|
Total string
|
|
Total string
|
|
@@ -1453,6 +1459,7 @@ func (s *SubService) BuildPageData(subId string, hostHeader string, traffic xray
|
|
|
Host: hostHeader,
|
|
Host: hostHeader,
|
|
|
BasePath: basePath,
|
|
BasePath: basePath,
|
|
|
SId: subId,
|
|
SId: subId,
|
|
|
|
|
+ Enabled: traffic.Enable,
|
|
|
Download: download,
|
|
Download: download,
|
|
|
Upload: upload,
|
|
Upload: upload,
|
|
|
Total: total,
|
|
Total: total,
|