← All changes | includes/Core/Util/IpTool.php +178 -142 2.10.0 → V3.3.2 View file →

		@@ -14,57 +14,92 @@
14	14	* @return string IP address of current visitor
15	15	*/
16	16
17	17	/**
	18	+ * Stored form of an IP: IPv4 as unsigned number (existing rows), IPv6 as text (numeric form was lossy).
18	19	*
19		- ipaddress converted to number digit
20		- */
21		- private static function ip2Number($ipAdr)
	20	+ * @param mixed $ip IP address
	21	+ *
	22	+ * @return string '' when $ip is not a valid address
	23	+ */
	24	+ public static function storageValue($ip)
22	25	{
23		- $ipTobytes = @inet_pton($ipAdr);
	26	+ if (!is_string($ip) || false === filter_var($ip, FILTER_VALIDATE_IP)) {
	27	+ return '';
	28	+ }
	29	+ if (false !== filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
	30	+ return sprintf('%u', ip2long($ip));
	31	+ }
	32	+ $packed = inet_pton($ip);
24	33
25		- if (!$ipTobytes) {
26		- return false;
	34	+ return false === $packed ? '' : (string) inet_ntop($packed);
	35	+ }
	36	+
	37	+ /**
	38	+ * Readable IP for a stored user_ip value.
	39	+ *
	40	+ * @param mixed $stored Value from user_ip
	41	+ *
	42	+ * @return string IP address, or '' for empty/lossy pre-3.3.2 IPv6 values
	43	+ */
	44	+ public static function displayValue($stored)
	45	+ {
	46	+ $stored = trim((string) $stored);
	47	+ if ('' === $stored) {
	48	+ return '';
27	49	}
28		-
29		- $number = '';
30		- foreach (unpack('C*', $ipTobytes) as $byte) {
31		- $number .= str_pad(decbin($byte), 8, '0', STR_PAD_LEFT);
	50	+ if (ctype_digit($stored)) {
	51	+ return (strlen($stored) <= 10 && (float) $stored <= 4294967295) ? long2ip((int) $stored) : '';
32	52	}
33	53
34		- return base_convert(ltrim($number, '0'), 2, 10);
	54	+ return false === filter_var($stored, FILTER_VALIDATE_IP) ? '' : $stored;
35	55	}
36	56
37		- private static function validateIpAddress($ip)
	57	+ /**
	58	+ * First valid IP in a client-controlled header value; anything else is rejected (injection guard).
	59	+ *
	60	+ * @param mixed $value Raw header value
	61	+ *
	62	+ * @return string IP address, or ''
	63	+ */
	64	+ public static function extractValidIp($value)
38	65	{
39		- $ipv4Pattern = '/(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:[.](?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}/';
40		- $ipv6Pattern = '/([A-Fa-f0-9]{1,4})\:([A-Fa-f0-9]{1,4})\:([A-Fa-f0-9]{1,4})\:([A-Fa-f0-9]{1,4})\:([A-Fa-f0-9]{1,4})\:([A-Fa-f0-9]{1,4})\:([A-Fa-f0-9]{1,4})\:([A-Fa-f0-9]{1,4})/';
	66	+ if (!is_string($value) || '' === $value) {
	67	+ return '';
	68	+ }
41	69
42		- if (preg_match($ipv4Pattern, $ip, $patternMatchIp)) {
43		- $ip = $patternMatchIp[0];
44		- } elseif (preg_match($ipv6Pattern, $ip, $patternMatchIp)) {
45		- $ip = $patternMatchIp[0];
	70	+ $ipv4Pattern = '/(?<![\d.])(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:[.](?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}(?![\d.])/';
	71	+
	72	+ foreach (preg_split('/[\s,;]+/', $value) as $part) {
	73	+ $part = trim(preg_replace('/^for=/i', '', $part), "\"'");
	74	+ if (preg_match('/^\[([^\]]+)\]/', $part, $bracketed)) {
	75	+ $part = $bracketed[1];
	76	+ }
	77	+
	78	+ if (false !== filter_var($part, FILTER_VALIDATE_IP)) {
	79	+ return $part;
	80	+ }
	81	+
	82	+ // IPv4 with port, e.g. "203.0.113.7:8080"
	83	+ if (preg_match($ipv4Pattern, $part, $match) && false !== filter_var($match[0], FILTER_VALIDATE_IP)) {
	84	+ return $match[0];
	85	+ }
46	86	}
47	87
48		- return $ip;
	88	+ return '';
49	89	}
50	90
51	91	private static function _checkIP()
52	92	{
53		- if (getenv('HTTP_CLIENT_IP')) {
54		- $ip = getenv('HTTP_CLIENT_IP');
55		- } elseif (getenv('HTTP_X_FORWARDED_FOR')) {
56		- $ip = getenv('HTTP_X_FORWARDED_FOR');
57		- } elseif (getenv('HTTP_X_FORWARDED')) {
58		- $ip = getenv('HTTP_X_FORWARDED');
59		- } elseif (getenv('HTTP_FORWARDED_FOR')) {
60		- $ip = getenv('HTTP_FORWARDED_FOR');
61		- } elseif (getenv('HTTP_FORWARDED')) {
62		- $ip = getenv('HTTP_FORWARDED');
63		- } else {
64		- $ip = $_SERVER['REMOTE_ADDR'];
	93	+ $headers = ['HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR', 'HTTP_X_FORWARDED', 'HTTP_FORWARDED_FOR', 'HTTP_FORWARDED'];
	94	+ foreach ($headers as $header) {
	95	+ $ip = IpTool::extractValidIp(getenv($header));
	96	+ if ('' !== $ip) {
	97	+ return $ip;
	98	+ }
65	99	}
66		- return IpTool::validateIpAddress($ip);
	100	+
	101	+ return IpTool::extractValidIp(isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '');
67	102	}
68	103
69	104	/**
70	105	* Check device info
		@@ -73,9 +108,9 @@
73	108	*/
74	109	private static function _checkDevice()
75	110	{
76	111	if (isset($_SERVER, $_SERVER['HTTP_USER_AGENT'])) {
77		- $user_agent = $_SERVER['HTTP_USER_AGENT'];
	112	+ $user_agent = sanitize_text_field(wp_unslash($_SERVER['HTTP_USER_AGENT']));
78	113	} else {
79	114	$user_agent = '';
80	115	}
81	116	return IpTool::_getBrowserName($user_agent) . '|' . IpTool::_getOS($user_agent);
		@@ -170,131 +205,132 @@
170	205	* @return void
171	206	*/
172	207	private static function _getOS($user_agent)
173	208	{
174		- $ros[] = ['Windows XP', 'Windows XP'];
175		- $ros[] = ['Windows NT 5.1|Windows NT5.1', 'Windows XP'];
176		- $ros[] = ['Windows 2000', 'Windows 2000'];
177		- $ros[] = ['Windows NT 5.0', 'Windows 2000'];
178		- $ros[] = ['Windows NT 4.0|WinNT4.0', 'Windows NT'];
179		- $ros[] = ['Windows NT 5.2', 'Windows Server 2003'];
180		- $ros[] = ['Windows NT 6.0', 'Windows Vista'];
181		- $ros[] = ['Windows NT 7.0', 'Windows 7'];
182		- $ros[] = ['Windows CE', 'Windows CE'];
183		- $ros[] = [
184		- '(media center pc).([0-9]{1,2}\.[0-9]{1,2})',
185		- 'Windows Media Center',
186		- ];
187		- $ros[] = ['(win)([0-9]{1,2}\.[0-9x]{1,2})', 'Windows'];
188		- $ros[] = ['(win)([0-9]{2})', 'Windows'];
189		- $ros[] = ['(windows)([0-9x]{2})', 'Windows'];
	209	+ $ros[] = ['Windows XP', 'Windows XP', false];
	210	+ $ros[] = ['Windows NT 5.1|Windows NT5.1', 'Windows XP', true];
	211	+ $ros[] = ['Windows 2000', 'Windows 2000', false];
	212	+ $ros[] = ['Windows NT 5.0', 'Windows 2000', false];
	213	+ $ros[] = ['Windows NT 4.0|WinNT4.0', 'Windows NT', true];
	214	+ $ros[] = ['Windows NT 5.2', 'Windows Server 2003', false];
	215	+ $ros[] = ['Windows NT 6.0', 'Windows Vista', false];
	216	+ $ros[] = ['Windows NT 7.0', 'Windows 7', false];
	217	+ $ros[] = ['Windows CE', 'Windows CE', false];
	218	+ $ros[] = ['(media center pc).([0-9]{1,2}\.[0-9]{1,2})', 'Windows Media Center', true];
	219	+ $ros[] = ['(win)([0-9]{1,2}\.[0-9x]{1,2})', 'Windows', true];
	220	+ $ros[] = ['(win)([0-9]{2})', 'Windows', true];
	221	+ $ros[] = ['(windows)([0-9x]{2})', 'Windows', true];
190	222	// Doesn't seem like these are necessary...not totally sure though..
191	223	//$ros[] = array('(winnt)([0-9]{1,2}\.[0-9]{1,2}){0,1}', 'Windows NT');
192	224	//$ros[] = array('(windows nt)(([0-9]{1,2}\.[0-9]{1,2}){0,1})', 'Windows NT'); // fix by bg
193		- $ros[] = ['Windows ME', 'Windows ME'];
194		- $ros[] = ['Win 9x 4.90', 'Windows ME'];
195		- $ros[] = ['Windows 98|Win98', 'Windows 98'];
196		- $ros[] = ['Windows 95', 'Windows 95'];
197		- $ros[] = ['(windows)([0-9]{1,2}\.[0-9]{1,2})', 'Windows'];
198		- $ros[] = ['win32', 'Windows'];
199		- $ros[] = ['(java)([0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2})', 'Java'];
200		- $ros[] = ['(Solaris)([0-9]{1,2}\.[0-9x]{1,2}){0,1}', 'Solaris'];
201		- $ros[] = ['dos x86', 'DOS'];
202		- $ros[] = ['unix', 'Unix'];
	225	+ $ros[] = ['Windows ME', 'Windows ME', false];
	226	+ $ros[] = ['Win 9x 4.90', 'Windows ME', false];
	227	+ $ros[] = ['Windows 98|Win98', 'Windows 98', true];
	228	+ $ros[] = ['Windows 95', 'Windows 95', false];
	229	+ $ros[] = ['(windows)([0-9]{1,2}\.[0-9]{1,2})', 'Windows', true];
	230	+ $ros[] = ['win32', 'Windows', false];
	231	+ $ros[] = ['(java)([0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2})', 'Java', true];
	232	+ $ros[] = ['(Solaris)([0-9]{1,2}\.[0-9x]{1,2}){0,1}', 'Solaris', true];
	233	+ $ros[] = ['dos x86', 'DOS', false];
	234	+ $ros[] = ['unix', 'Unix', false];
203	235	//Android
204		- $ros[] = ['SM', 'Samsung'];
205		- $ros[] = ['HTC', 'HTC'];
206		- $ros[] = ['LG', 'LG'];
207		- $ros[] = ['Microsoft', 'Microsoft'];
208		- $ros[] = ['Pixel', 'Pixel'];
209		- $ros[] = ['MI', 'Xiaomi'];
210		- $ros[] = ['Xiaomi', 'Xiaomi'];
211		- $ros[] = ['Android', 'Android'];
212		- $ros[] = ['android', 'Android'];
	236	+ $ros[] = ['SM', 'Samsung', false];
	237	+ $ros[] = ['HTC', 'HTC', false];
	238	+ $ros[] = ['LG', 'LG', false];
	239	+ $ros[] = ['Microsoft', 'Microsoft', false];
	240	+ $ros[] = ['Pixel', 'Pixel', false];
	241	+ $ros[] = ['MI', 'Xiaomi', false];
	242	+ $ros[] = ['Xiaomi', 'Xiaomi', false];
	243	+ $ros[] = ['Android', 'Android', false];
	244	+ $ros[] = ['android', 'Android', false];
213	245
214	246	//iPhone
215		- $ros[] = ['iPhone', 'iPhone'];
	247	+ $ros[] = ['iPhone', 'iPhone', false];
216	248
217		- $ros[] = ['Mac OS X', 'Mac OS X'];
218		- $ros[] = ['Mac OS X Puma', 'Mac OS X 10.1[^0-9]'];
219		- $ros[] = ['Mac_PowerPC', 'Macintosh PowerPC'];
220		- $ros[] = ['(mac|Macintosh)', 'Mac OS'];
221		- $ros[] = ['(sunos)([0-9]{1,2}\.[0-9]{1,2}){0,1}', 'SunOS'];
222		- $ros[] = ['(beos)([0-9]{1,2}\.[0-9]{1,2}){0,1}', 'BeOS'];
223		- $ros[] = ['(risc os)([0-9]{1,2}\.[0-9]{1,2})', 'RISC OS'];
224		- $ros[] = ['os\/2', 'OS/2'];
225		- $ros[] = ['freebsd', 'FreeBSD'];
226		- $ros[] = ['openbsd', 'OpenBSD'];
227		- $ros[] = ['netbsd', 'NetBSD'];
228		- $ros[] = ['irix', 'IRIX'];
229		- $ros[] = ['plan9', 'Plan9'];
230		- $ros[] = ['osf', 'OSF'];
231		- $ros[] = ['aix', 'AIX'];
232		- $ros[] = ['GNU Hurd', 'GNU Hurd'];
233		- $ros[] = ['(fedora)', 'Linux - Fedora'];
234		- $ros[] = ['(kubuntu)', 'Linux - Kubuntu'];
235		- $ros[] = ['(ubuntu)', 'Linux - Ubuntu'];
236		- $ros[] = ['(debian)', 'Linux - Debian'];
237		- $ros[] = ['(CentOS)', 'Linux - CentOS'];
238		- $ros[] = [
239		- '(Mandriva).([0-9]{1,3}(\.[0-9]{1,3})?(\.[0-9]{1,3})?)',
240		- 'Linux - Mandriva',
241		- ];
242		- $ros[] = [
243		- '(SUSE).([0-9]{1,3}(\.[0-9]{1,3})?(\.[0-9]{1,3})?)',
244		- 'Linux - SUSE',
245		- ];
246		- $ros[] = ['(Dropline)', 'Linux - Slackware (Dropline GNOME)'];
247		- $ros[] = ['(ASPLinux)', 'Linux - ASPLinux'];
248		- $ros[] = ['(Red Hat)', 'Linux - Red Hat'];
	249	+ $ros[] = ['Mac OS X', 'Mac OS X', false];
	250	+ $ros[] = ['Mac OS X Puma', 'Mac OS X 10.1[^0-9]', true];
	251	+ $ros[] = ['Mac_PowerPC', 'Macintosh PowerPC', false];
	252	+ $ros[] = ['(mac|Macintosh)', 'Mac OS', true];
	253	+ $ros[] = ['(sunos)([0-9]{1,2}\.[0-9]{1,2}){0,1}', 'SunOS', true];
	254	+ $ros[] = ['(beos)([0-9]{1,2}\.[0-9]{1,2}){0,1}', 'BeOS', true];
	255	+ $ros[] = ['(risc os)([0-9]{1,2}\.[0-9]{1,2})', 'RISC OS', true];
	256	+ $ros[] = ['os\/2', 'OS/2', true];
	257	+ $ros[] = ['freebsd', 'FreeBSD', false];
	258	+ $ros[] = ['openbsd', 'OpenBSD', false];
	259	+ $ros[] = ['netbsd', 'NetBSD', false];
	260	+ $ros[] = ['irix', 'IRIX', false];
	261	+ $ros[] = ['plan9', 'Plan9', false];
	262	+ $ros[] = ['osf', 'OSF', false];
	263	+ $ros[] = ['aix', 'AIX', false];
	264	+ $ros[] = ['GNU Hurd', 'GNU Hurd', false];
	265	+ $ros[] = ['(fedora)', 'Linux - Fedora', true];
	266	+ $ros[] = ['(kubuntu)', 'Linux - Kubuntu', true];
	267	+ $ros[] = ['(ubuntu)', 'Linux - Ubuntu', true];
	268	+ $ros[] = ['(debian)', 'Linux - Debian', true];
	269	+ $ros[] = ['(CentOS)', 'Linux - CentOS', true];
	270	+ $ros[] = ['(Mandriva).([0-9]{1,3}(\.[0-9]{1,3})?(\.[0-9]{1,3})?)', 'Linux - Mandriva', true];
	271	+ $ros[] = ['(SUSE).([0-9]{1,3}(\.[0-9]{1,3})?(\.[0-9]{1,3})?)', 'Linux - SUSE', true];
	272	+ $ros[] = ['(Dropline)', 'Linux - Slackware (Dropline GNOME)', true];
	273	+ $ros[] = ['(ASPLinux)', 'Linux - ASPLinux', true];
	274	+ $ros[] = ['(Red Hat)', 'Linux - Red Hat', true];
249	275	// Loads of Linux machines will be detected as unix.
250	276	// Actually, all of the linux machines I've checked have the 'X11' in the User Agent.
251	277	//$ros[] = array('X11', 'Unix');
252		- $ros[] = ['(linux)', 'Linux'];
253		- $ros[] = ['(amigaos)([0-9]{1,2}\.[0-9]{1,2})', 'AmigaOS'];
254		- $ros[] = ['amiga-aweb', 'AmigaOS'];
255		- $ros[] = ['amiga', 'Amiga'];
256		- $ros[] = ['AvantGo', 'PalmOS'];
	278	+ $ros[] = ['(linux)', 'Linux', true];
	279	+ $ros[] = ['(amigaos)([0-9]{1,2}\.[0-9]{1,2})', 'AmigaOS', true];
	280	+ $ros[] = ['amiga-aweb', 'AmigaOS', false];
	281	+ $ros[] = ['amiga', 'Amiga', false];
	282	+ $ros[] = ['AvantGo', 'PalmOS', false];
257	283	//$ros[] = array('(Linux)([0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,3}(rel\.[0-9]{1,2}){0,1}-([0-9]{1,2}) i([0-9]{1})86){1}', 'Linux');
258	284	//$ros[] = array('(Linux)([0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,3}(rel\.[0-9]{1,2}){0,1} i([0-9]{1}86)){1}', 'Linux');
259	285	//$ros[] = array('(Linux)([0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,3}(rel\.[0-9]{1,2}){0,1})', 'Linux');
260		- $ros[] = ['[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,3})', 'Linux'];
261		- $ros[] = ['(webtv)/([0-9]{1,2}\.[0-9]{1,2})', 'WebTV'];
262		- $ros[] = ['Dreamcast', 'Dreamcast OS'];
263		- $ros[] = ['GetRight', 'Windows'];
264		- $ros[] = ['go!zilla', 'Windows'];
265		- $ros[] = ['gozilla', 'Windows'];
266		- $ros[] = ['gulliver', 'Windows'];
267		- $ros[] = ['ia archiver', 'Windows'];
268		- $ros[] = ['NetPositive', 'Windows'];
269		- $ros[] = ['mass downloader', 'Windows'];
270		- $ros[] = ['microsoft', 'Windows'];
271		- $ros[] = ['offline explorer', 'Windows'];
272		- $ros[] = ['teleport', 'Windows'];
273		- $ros[] = ['web downloader', 'Windows'];
274		- $ros[] = ['webcapture', 'Windows'];
275		- $ros[] = ['webcollage', 'Windows'];
276		- $ros[] = ['webcopier', 'Windows'];
277		- $ros[] = ['webstripper', 'Windows'];
278		- $ros[] = ['webzip', 'Windows'];
279		- $ros[] = ['wget', 'Windows'];
280		- $ros[] = ['Java', 'Unknown'];
281		- $ros[] = ['flashget', 'Windows'];
	286	+ $ros[] = ['[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,3}', 'Linux', true];
	287	+ $ros[] = ['(webtv)/([0-9]{1,2}\.[0-9]{1,2})', 'WebTV', true];
	288	+ $ros[] = ['Dreamcast', 'Dreamcast OS', false];
	289	+ $ros[] = ['GetRight', 'Windows', false];
	290	+ $ros[] = ['go!zilla', 'Windows', false];
	291	+ $ros[] = ['gozilla', 'Windows', false];
	292	+ $ros[] = ['gulliver', 'Windows', false];
	293	+ $ros[] = ['ia archiver', 'Windows', false];
	294	+ $ros[] = ['NetPositive', 'Windows', false];
	295	+ $ros[] = ['mass downloader', 'Windows', false];
	296	+ $ros[] = ['microsoft', 'Windows', false];
	297	+ $ros[] = ['offline explorer', 'Windows', false];
	298	+ $ros[] = ['teleport', 'Windows', false];
	299	+ $ros[] = ['web downloader', 'Windows', false];
	300	+ $ros[] = ['webcapture', 'Windows', false];
	301	+ $ros[] = ['webcollage', 'Windows', false];
	302	+ $ros[] = ['webcopier', 'Windows', false];
	303	+ $ros[] = ['webstripper', 'Windows', false];
	304	+ $ros[] = ['webzip', 'Windows', false];
	305	+ $ros[] = ['wget', 'Windows', false];
	306	+ $ros[] = ['Java', 'Unknown', false];
	307	+ $ros[] = ['flashget', 'Windows', false];
282	308	// delete next line if the script show not the right OS
283	309	//$ros[] = array('(PHP)/([0-9]{1,2}.[0-9]{1,2})', 'PHP');
284		- $ros[] = ['MS FrontPage', 'Windows'];
285		- $ros[] = ['(msproxy)/([0-9]{1,2}.[0-9]{1,2})', 'Windows'];
286		- $ros[] = ['(msie)([0-9]{1,2}.[0-9]{1,2})', 'Windows'];
287		- $ros[] = ['libwww-perl', 'Unix'];
288		- $ros[] = ['UP.Browser', 'Windows CE'];
289		- $ros[] = ['NetAnts', 'Windows'];
290		- $ros[] = ['Android', 'Android'];
	310	+ $ros[] = ['MS FrontPage', 'Windows', false];
	311	+ $ros[] = ['(msproxy)/([0-9]{1,2}\.[0-9]{1,2})', 'Windows', true];
	312	+ $ros[] = ['(msie)([0-9]{1,2}\.[0-9]{1,2})', 'Windows', true];
	313	+ $ros[] = ['libwww-perl', 'Unix', false];
	314	+ $ros[] = ['UP.Browser', 'Windows CE', false];
	315	+ $ros[] = ['NetAnts', 'Windows', false];
	316	+ $ros[] = ['Android', 'Android', false];
291	317	$file = count($ros);
292	318	$os = '';
293	319	for ($n = 0; $n < $file; $n++) {
294		- if (@preg_match('/' . $ros[$n][0] . '/i', $user_agent)) {
295		- $os = @$ros[$n][1];
296		- break;
	320	+ $isRegex = isset($ros[$n][2]) && true === $ros[$n][2];
	321	+ $pattern = $ros[$n][0];
	322	+
	323	+ if ($isRegex) {
	324	+ if (@preg_match('/' . $pattern . '/i', $user_agent)) {
	325	+ $os = $ros[$n][1];
	326	+ break;
	327	+ }
	328	+ } else {
	329	+ if (false !== stripos($user_agent, $pattern)) {
	330	+ $os = $ros[$n][1];
	331	+ break;
	332	+ }
297	333	}
298	334	}
299	335	return trim($os);
300	336	}
		@@ -306,9 +342,9 @@
306	342	*/
307	343	private static function _setUserDetail()
308	344	{
309	345	$referer = wp_get_referer();
310		- $user_details['ip'] = IpTool::ip2Number(IpTool::_checkIP());
	346	+ $user_details['ip'] = IpTool::storageValue(IpTool::_checkIP());
311	347	$user_details['device'] = IpTool::_checkDevice();
312	348	$user_details['id'] = get_current_user_id();
313	349	$user_details['page'] = $referer ? $referer : '';
314	350	$user_details['time'] = current_time('mysql');
		@@ -318,9 +354,9 @@
318	354
319	355	/**
320	356	* Provide user details
321	357	*
322		- * @return _setUserDetail user details array
	358	+ * @return array user details array
323	359	*/
324	360	public static function getUserDetail()
325	361	{
326	362	return IpTool::_setUserDetail();
		@@ -328,11 +364,11 @@
328	364
329	365	/**
330	366	* Provide user IP address
331	367	*
332		- * @return ip
	368	+ * @return string IP address, or ''
333	369	*/
334	370	public static function getIP()
335	371	{
336	372	return IpTool::_checkIP();
337	373	}
338		-}
	374	+}