|
|
@@ -715,7 +715,7 @@ class Events
|
|
|
$ret = file_get_contents($url);
|
|
|
$defret = '未知';
|
|
|
|
|
|
- $ipreg = "/(192\.168\.*)|(10\.*)|(172\.(1|2|3)\d)\.*/";
|
|
|
+ $ipreg = "/(^192\.168\.*)|(^10\.*)|(^172\.(1|2|3)\d)\.*/";
|
|
|
if (preg_match($ipreg, $ip)) {
|
|
|
$defret = '局域网';
|
|
|
return $defret;
|
|
|
@@ -724,15 +724,13 @@ class Events
|
|
|
return $defret;
|
|
|
}
|
|
|
|
|
|
- $word1 = explode('：', $ret);
|
|
|
- if (isset($word1['2'])) {
|
|
|
- $word2 = explode(" ", $word1['2']);
|
|
|
- if (isset($word2['0'])) {
|
|
|
- $defret = trim($word2['0']);
|
|
|
+ $regipinfo = "/：[\x80-\xff]{1,}/";
|
|
|
+ if (preg_match($regipinfo, $ret, $ipinfoArr)) {
|
|
|
+ if (isset($ipinfoArr['0'])) {
|
|
|
+ $defret = trim($ipinfoArr['0'], '：');
|
|
|
return $defret;
|
|
|
}
|
|
|
}
|
|
|
- $defret = $ret;
|
|
|
return $defret;
|
|
|
}
|
|
|
|
vali