← All changes | includes/Core/Util/IpTool.php +110 -109 2.10.0 → 3.3.1 View file →

		@@ -60,9 +60,9 @@
60	60	$ip = getenv('HTTP_FORWARDED_FOR');
61	61	} elseif (getenv('HTTP_FORWARDED')) {
62	62	$ip = getenv('HTTP_FORWARDED');
63	63	} else {
64		- $ip = $_SERVER['REMOTE_ADDR'];
	64	+ $ip = isset($_SERVER['REMOTE_ADDR']) ? sanitize_text_field(wp_unslash($_SERVER['REMOTE_ADDR'])) : '';
65	65	}
66	66	return IpTool::validateIpAddress($ip);
67	67	}
68	68
		@@ -73,9 +73,9 @@
73	73	*/
74	74	private static function _checkDevice()
75	75	{
76	76	if (isset($_SERVER, $_SERVER['HTTP_USER_AGENT'])) {
77		- $user_agent = $_SERVER['HTTP_USER_AGENT'];
	77	+ $user_agent = sanitize_text_field(wp_unslash($_SERVER['HTTP_USER_AGENT']));
78	78	} else {
79	79	$user_agent = '';
80	80	}
81	81	return IpTool::_getBrowserName($user_agent) . '|' . IpTool::_getOS($user_agent);
		@@ -170,131 +170,132 @@
170	170	* @return void
171	171	*/
172	172	private static function _getOS($user_agent)
173	173	{
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'];
	174	+ $ros[] = ['Windows XP', 'Windows XP', false];
	175	+ $ros[] = ['Windows NT 5.1|Windows NT5.1', 'Windows XP', true];
	176	+ $ros[] = ['Windows 2000', 'Windows 2000', false];
	177	+ $ros[] = ['Windows NT 5.0', 'Windows 2000', false];
	178	+ $ros[] = ['Windows NT 4.0|WinNT4.0', 'Windows NT', true];
	179	+ $ros[] = ['Windows NT 5.2', 'Windows Server 2003', false];
	180	+ $ros[] = ['Windows NT 6.0', 'Windows Vista', false];
	181	+ $ros[] = ['Windows NT 7.0', 'Windows 7', false];
	182	+ $ros[] = ['Windows CE', 'Windows CE', false];
	183	+ $ros[] = ['(media center pc).([0-9]{1,2}\.[0-9]{1,2})', 'Windows Media Center', true];
	184	+ $ros[] = ['(win)([0-9]{1,2}\.[0-9x]{1,2})', 'Windows', true];
	185	+ $ros[] = ['(win)([0-9]{2})', 'Windows', true];
	186	+ $ros[] = ['(windows)([0-9x]{2})', 'Windows', true];
190	187	// Doesn't seem like these are necessary...not totally sure though..
191	188	//$ros[] = array('(winnt)([0-9]{1,2}\.[0-9]{1,2}){0,1}', 'Windows NT');
192	189	//$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'];
	190	+ $ros[] = ['Windows ME', 'Windows ME', false];
	191	+ $ros[] = ['Win 9x 4.90', 'Windows ME', false];
	192	+ $ros[] = ['Windows 98|Win98', 'Windows 98', true];
	193	+ $ros[] = ['Windows 95', 'Windows 95', false];
	194	+ $ros[] = ['(windows)([0-9]{1,2}\.[0-9]{1,2})', 'Windows', true];
	195	+ $ros[] = ['win32', 'Windows', false];
	196	+ $ros[] = ['(java)([0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2})', 'Java', true];
	197	+ $ros[] = ['(Solaris)([0-9]{1,2}\.[0-9x]{1,2}){0,1}', 'Solaris', true];
	198	+ $ros[] = ['dos x86', 'DOS', false];
	199	+ $ros[] = ['unix', 'Unix', false];
203	200	//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'];
	201	+ $ros[] = ['SM', 'Samsung', false];
	202	+ $ros[] = ['HTC', 'HTC', false];
	203	+ $ros[] = ['LG', 'LG', false];
	204	+ $ros[] = ['Microsoft', 'Microsoft', false];
	205	+ $ros[] = ['Pixel', 'Pixel', false];
	206	+ $ros[] = ['MI', 'Xiaomi', false];
	207	+ $ros[] = ['Xiaomi', 'Xiaomi', false];
	208	+ $ros[] = ['Android', 'Android', false];
	209	+ $ros[] = ['android', 'Android', false];
213	210
214	211	//iPhone
215		- $ros[] = ['iPhone', 'iPhone'];
	212	+ $ros[] = ['iPhone', 'iPhone', false];
216	213
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'];
	214	+ $ros[] = ['Mac OS X', 'Mac OS X', false];
	215	+ $ros[] = ['Mac OS X Puma', 'Mac OS X 10.1[^0-9]', true];
	216	+ $ros[] = ['Mac_PowerPC', 'Macintosh PowerPC', false];
	217	+ $ros[] = ['(mac|Macintosh)', 'Mac OS', true];
	218	+ $ros[] = ['(sunos)([0-9]{1,2}\.[0-9]{1,2}){0,1}', 'SunOS', true];
	219	+ $ros[] = ['(beos)([0-9]{1,2}\.[0-9]{1,2}){0,1}', 'BeOS', true];
	220	+ $ros[] = ['(risc os)([0-9]{1,2}\.[0-9]{1,2})', 'RISC OS', true];
	221	+ $ros[] = ['os\/2', 'OS/2', true];
	222	+ $ros[] = ['freebsd', 'FreeBSD', false];
	223	+ $ros[] = ['openbsd', 'OpenBSD', false];
	224	+ $ros[] = ['netbsd', 'NetBSD', false];
	225	+ $ros[] = ['irix', 'IRIX', false];
	226	+ $ros[] = ['plan9', 'Plan9', false];
	227	+ $ros[] = ['osf', 'OSF', false];
	228	+ $ros[] = ['aix', 'AIX', false];
	229	+ $ros[] = ['GNU Hurd', 'GNU Hurd', false];
	230	+ $ros[] = ['(fedora)', 'Linux - Fedora', true];
	231	+ $ros[] = ['(kubuntu)', 'Linux - Kubuntu', true];
	232	+ $ros[] = ['(ubuntu)', 'Linux - Ubuntu', true];
	233	+ $ros[] = ['(debian)', 'Linux - Debian', true];
	234	+ $ros[] = ['(CentOS)', 'Linux - CentOS', true];
	235	+ $ros[] = ['(Mandriva).([0-9]{1,3}(\.[0-9]{1,3})?(\.[0-9]{1,3})?)', 'Linux - Mandriva', true];
	236	+ $ros[] = ['(SUSE).([0-9]{1,3}(\.[0-9]{1,3})?(\.[0-9]{1,3})?)', 'Linux - SUSE', true];
	237	+ $ros[] = ['(Dropline)', 'Linux - Slackware (Dropline GNOME)', true];
	238	+ $ros[] = ['(ASPLinux)', 'Linux - ASPLinux', true];
	239	+ $ros[] = ['(Red Hat)', 'Linux - Red Hat', true];
249	240	// Loads of Linux machines will be detected as unix.
250	241	// Actually, all of the linux machines I've checked have the 'X11' in the User Agent.
251	242	//$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'];
	243	+ $ros[] = ['(linux)', 'Linux', true];
	244	+ $ros[] = ['(amigaos)([0-9]{1,2}\.[0-9]{1,2})', 'AmigaOS', true];
	245	+ $ros[] = ['amiga-aweb', 'AmigaOS', false];
	246	+ $ros[] = ['amiga', 'Amiga', false];
	247	+ $ros[] = ['AvantGo', 'PalmOS', false];
257	248	//$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	249	//$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	250	//$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'];
	251	+ $ros[] = ['[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,3}', 'Linux', true];
	252	+ $ros[] = ['(webtv)/([0-9]{1,2}\.[0-9]{1,2})', 'WebTV', true];
	253	+ $ros[] = ['Dreamcast', 'Dreamcast OS', false];
	254	+ $ros[] = ['GetRight', 'Windows', false];
	255	+ $ros[] = ['go!zilla', 'Windows', false];
	256	+ $ros[] = ['gozilla', 'Windows', false];
	257	+ $ros[] = ['gulliver', 'Windows', false];
	258	+ $ros[] = ['ia archiver', 'Windows', false];
	259	+ $ros[] = ['NetPositive', 'Windows', false];
	260	+ $ros[] = ['mass downloader', 'Windows', false];
	261	+ $ros[] = ['microsoft', 'Windows', false];
	262	+ $ros[] = ['offline explorer', 'Windows', false];
	263	+ $ros[] = ['teleport', 'Windows', false];
	264	+ $ros[] = ['web downloader', 'Windows', false];
	265	+ $ros[] = ['webcapture', 'Windows', false];
	266	+ $ros[] = ['webcollage', 'Windows', false];
	267	+ $ros[] = ['webcopier', 'Windows', false];
	268	+ $ros[] = ['webstripper', 'Windows', false];
	269	+ $ros[] = ['webzip', 'Windows', false];
	270	+ $ros[] = ['wget', 'Windows', false];
	271	+ $ros[] = ['Java', 'Unknown', false];
	272	+ $ros[] = ['flashget', 'Windows', false];
282	273	// delete next line if the script show not the right OS
283	274	//$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'];
	275	+ $ros[] = ['MS FrontPage', 'Windows', false];
	276	+ $ros[] = ['(msproxy)/([0-9]{1,2}\.[0-9]{1,2})', 'Windows', true];
	277	+ $ros[] = ['(msie)([0-9]{1,2}\.[0-9]{1,2})', 'Windows', true];
	278	+ $ros[] = ['libwww-perl', 'Unix', false];
	279	+ $ros[] = ['UP.Browser', 'Windows CE', false];
	280	+ $ros[] = ['NetAnts', 'Windows', false];
	281	+ $ros[] = ['Android', 'Android', false];
291	282	$file = count($ros);
292	283	$os = '';
293	284	for ($n = 0; $n < $file; $n++) {
294		- if (@preg_match('/' . $ros[$n][0] . '/i', $user_agent)) {
295		- $os = @$ros[$n][1];
296		- break;
	285	+ $isRegex = isset($ros[$n][2]) && true === $ros[$n][2];
	286	+ $pattern = $ros[$n][0];
	287	+
	288	+ if ($isRegex) {
	289	+ if (@preg_match('/' . $pattern . '/i', $user_agent)) {
	290	+ $os = $ros[$n][1];
	291	+ break;
	292	+ }
	293	+ } else {
	294	+ if (false !== stripos($user_agent, $pattern)) {
	295	+ $os = $ros[$n][1];
	296	+ break;
	297	+ }
297	298	}
298	299	}
299	300	return trim($os);
300	301	}
		@@ -318,9 +319,9 @@
318	319
319	320	/**
320	321	* Provide user details
321	322	*
322		- * @return _setUserDetail user details array
	323	+ * @return array user details array
323	324	*/
324	325	public static function getUserDetail()
325	326	{
326	327	return IpTool::_setUserDetail();
		@@ -334,5 +335,5 @@
334	335	public static function getIP()
335	336	{
336	337	return IpTool::_checkIP();
337	338	}
338		-}
	339	+}