|
11 | 11 | // Saving user IPs to the session for preventing session hijacking |
12 | 12 | $user_combined_ip = $_SERVER['REMOTE_ADDR']; |
13 | 13 |
|
14 | | -if(isset($_SERVER['HTTP_CLIENT_IP'])){ |
| 14 | +if (isset($_SERVER['HTTP_CLIENT_IP'])){ |
15 | 15 | $user_combined_ip .= '|'. $_SERVER['HTTP_CLIENT_IP']; |
16 | 16 | } |
17 | | -if(isset($_SERVER['HTTP_X_FORWARDED_FOR'])){ |
| 17 | +if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])){ |
18 | 18 | $user_combined_ip .= '|'. $_SERVER['HTTP_X_FORWARDED_FOR']; |
19 | 19 | } |
20 | | -if(isset($_SERVER['HTTP_FORWARDED_FOR'])){ |
| 20 | +if (isset($_SERVER['HTTP_FORWARDED_FOR'])){ |
21 | 21 | $user_combined_ip .= '|'. $_SERVER['HTTP_FORWARDED_FOR']; |
22 | 22 | } |
23 | | -if(isset($_SERVER['HTTP_X_FORWARDED'])){ |
| 23 | +if (isset($_SERVER['HTTP_X_FORWARDED'])){ |
24 | 24 | $user_combined_ip .= '|'. $_SERVER['HTTP_X_FORWARDED']; |
25 | 25 | } |
26 | | -if(isset($_SERVER['HTTP_FORWARDED'])){ |
| 26 | +if (isset($_SERVER['HTTP_FORWARDED'])){ |
27 | 27 | $user_combined_ip .= '|'. $_SERVER['HTTP_FORWARDED']; |
28 | 28 | } |
29 | | -if(isset($_SERVER['HTTP_CF_CONNECTING_IP'])){ |
| 29 | +if (isset($_SERVER['HTTP_CF_CONNECTING_IP'])){ |
30 | 30 | if(!empty($_SERVER['HTTP_CF_CONNECTING_IP'])){ |
31 | 31 | $user_combined_ip = $_SERVER['HTTP_CF_CONNECTING_IP']; |
32 | 32 | } |
33 | 33 | } |
34 | 34 |
|
35 | | -if(!isset($_SESSION['user_combined_ip'])){ |
| 35 | +if (!isset($_SESSION['user_combined_ip'])){ |
36 | 36 | $_SESSION['user_combined_ip'] = $user_combined_ip; |
37 | 37 | } |
38 | 38 |
|
39 | 39 | // Checking user to use session from the same IP he has been logged in |
40 | | -if($_SESSION['user_combined_ip'] != $user_combined_ip && $_SERVER['REMOTE_ADDR'] != '127.0.0.1'){ |
| 40 | +if ($_SESSION['user_combined_ip'] != $user_combined_ip && $_SERVER['REMOTE_ADDR'] != '127.0.0.1'){ |
41 | 41 | $v_user = escapeshellarg($_SESSION['user']); |
42 | 42 | $v_murmur = escapeshellarg($_SESSION['MURMUR']); |
43 | 43 | exec(HESTIA_CMD."v-log-user-logout ".$v_user." ".$v_murmur, $output, $return_var); |
|
74 | 74 | } |
75 | 75 | } |
76 | 76 |
|
77 | | -if( NO_AUTH_REQUIRED !== true){ |
78 | | - if(empty($_SESSION['LAST_ACTIVITY']) || empty($_SESSION['INACTIVE_SESSION_TIMEOUT'])){ |
| 77 | +if (!defined('NO_AUTH_REQUIRED')){ |
| 78 | + if (empty($_SESSION['LAST_ACTIVITY']) || empty($_SESSION['INACTIVE_SESSION_TIMEOUT'])){ |
79 | 79 | session_destroy(); |
80 | 80 | header("Location: /login/"); |
81 | | - }else if ($_SESSION['INACTIVE_SESSION_TIMEOUT'] * 60 + $_SESSION['LAST_ACTIVITY'] < time()) { |
| 81 | + } else if ($_SESSION['INACTIVE_SESSION_TIMEOUT'] * 60 + $_SESSION['LAST_ACTIVITY'] < time()) { |
82 | 82 | $v_user = escapeshellarg($_SESSION['user']); |
83 | 83 | $v_murmur = escapeshellarg($_SESSION['MURMUR']); |
84 | 84 | exec(HESTIA_CMD."v-log-user-logout ".$v_user." ".$v_murmur, $output, $return_var); |
85 | 85 | session_destroy(); |
86 | 86 | header("Location: /login/"); |
87 | | - }else{ |
| 87 | + } else { |
88 | 88 | $_SESSION['LAST_ACTIVITY'] = time(); |
89 | 89 | } |
90 | 90 | } |
|
0 commit comments