Skip to content

Commit b680e51

Browse files
Fix PHP warning (hestiacp#1547)
* Old code caused PHP message: PHP Warning: Use of undefined constant NO_AUTH_REQUIRED - assumed 'NO_AUTH_REQUIRED' * Adjust code fornat style Co-authored-by: Raphael Schneeberger <rs@scit.ch>
1 parent 410a00c commit b680e51

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

web/inc/main.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,33 @@
1111
// Saving user IPs to the session for preventing session hijacking
1212
$user_combined_ip = $_SERVER['REMOTE_ADDR'];
1313

14-
if(isset($_SERVER['HTTP_CLIENT_IP'])){
14+
if (isset($_SERVER['HTTP_CLIENT_IP'])){
1515
$user_combined_ip .= '|'. $_SERVER['HTTP_CLIENT_IP'];
1616
}
17-
if(isset($_SERVER['HTTP_X_FORWARDED_FOR'])){
17+
if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])){
1818
$user_combined_ip .= '|'. $_SERVER['HTTP_X_FORWARDED_FOR'];
1919
}
20-
if(isset($_SERVER['HTTP_FORWARDED_FOR'])){
20+
if (isset($_SERVER['HTTP_FORWARDED_FOR'])){
2121
$user_combined_ip .= '|'. $_SERVER['HTTP_FORWARDED_FOR'];
2222
}
23-
if(isset($_SERVER['HTTP_X_FORWARDED'])){
23+
if (isset($_SERVER['HTTP_X_FORWARDED'])){
2424
$user_combined_ip .= '|'. $_SERVER['HTTP_X_FORWARDED'];
2525
}
26-
if(isset($_SERVER['HTTP_FORWARDED'])){
26+
if (isset($_SERVER['HTTP_FORWARDED'])){
2727
$user_combined_ip .= '|'. $_SERVER['HTTP_FORWARDED'];
2828
}
29-
if(isset($_SERVER['HTTP_CF_CONNECTING_IP'])){
29+
if (isset($_SERVER['HTTP_CF_CONNECTING_IP'])){
3030
if(!empty($_SERVER['HTTP_CF_CONNECTING_IP'])){
3131
$user_combined_ip = $_SERVER['HTTP_CF_CONNECTING_IP'];
3232
}
3333
}
3434

35-
if(!isset($_SESSION['user_combined_ip'])){
35+
if (!isset($_SESSION['user_combined_ip'])){
3636
$_SESSION['user_combined_ip'] = $user_combined_ip;
3737
}
3838

3939
// 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'){
4141
$v_user = escapeshellarg($_SESSION['user']);
4242
$v_murmur = escapeshellarg($_SESSION['MURMUR']);
4343
exec(HESTIA_CMD."v-log-user-logout ".$v_user." ".$v_murmur, $output, $return_var);
@@ -74,17 +74,17 @@
7474
}
7575
}
7676

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'])){
7979
session_destroy();
8080
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()) {
8282
$v_user = escapeshellarg($_SESSION['user']);
8383
$v_murmur = escapeshellarg($_SESSION['MURMUR']);
8484
exec(HESTIA_CMD."v-log-user-logout ".$v_user." ".$v_murmur, $output, $return_var);
8585
session_destroy();
8686
header("Location: /login/");
87-
}else{
87+
} else {
8888
$_SESSION['LAST_ACTIVITY'] = time();
8989
}
9090
}

0 commit comments

Comments
 (0)