diff --git a/modules/overview/_includes.php b/modules/overview/_includes.php index 99dc7a3f..6c6d1cb3 100644 --- a/modules/overview/_includes.php +++ b/modules/overview/_includes.php @@ -7,6 +7,7 @@ $includePath = $_EnginePath . 'modules/overview/'; include($includePath . './screens/FirstLogin/FirstLogin.screen.php'); + include($includePath . './screens/FirstLogin/utils/effects/handleProxyDetection.effect.php'); }); diff --git a/modules/overview/screens/FirstLogin/utils/effects/handleProxyDetection.effect.php b/modules/overview/screens/FirstLogin/utils/effects/handleProxyDetection.effect.php new file mode 100644 index 00000000..ee72ba61 --- /dev/null +++ b/modules/overview/screens/FirstLogin/utils/effects/handleProxyDetection.effect.php @@ -0,0 +1,49 @@ + 0 AND $Result_CheckProxy['isProxy'] == 1) + { + if(!isset($_Included_AlertSystemUtilities)) + { + include($_EnginePath.'includes/functions/AlertSystemUtilities.php'); + $_Included_AlertSystemUtilities = true; + } + $FiltersData = array(); + $FiltersData['place'] = 4; + $FiltersData['alertsender'] = 5; + $FiltersData['users'] = array($user['id']); + $FiltersData['ips'] = array($Result_CheckProxy['ID']); + + $FilterResult = AlertUtils_CheckFilters($FiltersData, array('DontLoad' => true, 'DontLoad_OnlyIfCacheEmpty' => true)); + if($FilterResult['SendAlert']) + { + $_Alert['Data']['IPID'] = $Result_CheckProxy['ID']; + if($usersIP == $user['ip_at_reg']) + { + $_Alert['Data']['RegIP'] = true; + } + + Alerts_Add(5, $currentTimestamp, 1, 3, 8, $user['id'], $_Alert['Data']); + } + } +} + +?> diff --git a/modules/overview/screens/FirstLogin/utils/effects/index.php b/modules/overview/screens/FirstLogin/utils/effects/index.php new file mode 100644 index 00000000..bc99142d --- /dev/null +++ b/modules/overview/screens/FirstLogin/utils/effects/index.php @@ -0,0 +1,5 @@ + diff --git a/modules/overview/screens/FirstLogin/utils/index.php b/modules/overview/screens/FirstLogin/utils/index.php new file mode 100644 index 00000000..bc99142d --- /dev/null +++ b/modules/overview/screens/FirstLogin/utils/index.php @@ -0,0 +1,5 @@ + diff --git a/overview.php b/overview.php index 8533efd1..dc9842ad 100644 --- a/overview.php +++ b/overview.php @@ -9,12 +9,14 @@ include_once($_EnginePath . 'modules/session/_includes.php'); include_once($_EnginePath . 'modules/flights/_includes.php'); include_once($_EnginePath . 'modules/flightControl/_includes.php'); +include_once($_EnginePath . 'modules/overview/_includes.php'); use UniEngine\Engine\Includes\Helpers\Users; use UniEngine\Engine\Includes\Helpers\World\Elements; use UniEngine\Engine\Modules\Session; use UniEngine\Engine\Modules\Flights; use UniEngine\Engine\Modules\FlightControl; +use UniEngine\Engine\Modules\Overview; loggedCheck(); @@ -159,35 +161,10 @@ } // Check, if this IP is Proxy - $usersIP = Users\Session\getCurrentIP(); - $IPHash = md5($usersIP); - $Query_CheckProxy = "SELECT `ID`, `isProxy` FROM {{table}} WHERE `ValueHash` = '{$IPHash}' LIMIT 1;"; - $Result_CheckProxy = doquery($Query_CheckProxy, 'used_ip_and_ua', true); - if($Result_CheckProxy['ID'] > 0 AND $Result_CheckProxy['isProxy'] == 1) - { - if(!isset($_Included_AlertSystemUtilities)) - { - include($_EnginePath.'includes/functions/AlertSystemUtilities.php'); - $_Included_AlertSystemUtilities = true; - } - $FiltersData = array(); - $FiltersData['place'] = 4; - $FiltersData['alertsender'] = 5; - $FiltersData['users'] = array($_User['id']); - $FiltersData['ips'] = array($Result_CheckProxy['ID']); - - $FilterResult = AlertUtils_CheckFilters($FiltersData, array('DontLoad' => true, 'DontLoad_OnlyIfCacheEmpty' => true)); - if($FilterResult['SendAlert']) - { - $_Alert['Data']['IPID'] = $Result_CheckProxy['ID']; - if($usersIP == $_User['ip_at_reg']) - { - $_Alert['Data']['RegIP'] = true; - } - - Alerts_Add(5, $Now, 1, 3, 8, $_User['id'], $_Alert['Data']); - } - } + Overview\Screens\FirstLogin\Utils\Effects\handleProxyDetection([ + 'user' => &$_User, + 'currentTimestamp' => $Now, + ]); // Give Free ProAccount for 7 days //doquery("INSERT INTO {{table}} VALUES (NULL, {$_User['id']}, UNIX_TIMESTAMP(), 0, 0, 11, 0);", 'premium_free');