Просмотр исходного кода

Fix PHP warning (#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>
Jaap Marcus 5 лет назад
Родитель
Сommit
b680e5120e
1 измененных файлов с 12 добавлено и 12 удалено
  1. 12 12
      web/inc/main.php

+ 12 - 12
web/inc/main.php

@@ -11,33 +11,33 @@ $i = 0;
 // Saving user IPs to the session for preventing session hijacking
 $user_combined_ip = $_SERVER['REMOTE_ADDR'];
 
-if(isset($_SERVER['HTTP_CLIENT_IP'])){
+if (isset($_SERVER['HTTP_CLIENT_IP'])){
     $user_combined_ip .=  '|'. $_SERVER['HTTP_CLIENT_IP'];
 }
-if(isset($_SERVER['HTTP_X_FORWARDED_FOR'])){
+if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])){
     $user_combined_ip .=  '|'. $_SERVER['HTTP_X_FORWARDED_FOR'];
 }
-if(isset($_SERVER['HTTP_FORWARDED_FOR'])){
+if (isset($_SERVER['HTTP_FORWARDED_FOR'])){
     $user_combined_ip .=  '|'. $_SERVER['HTTP_FORWARDED_FOR'];
 }
-if(isset($_SERVER['HTTP_X_FORWARDED'])){
+if (isset($_SERVER['HTTP_X_FORWARDED'])){
     $user_combined_ip .=  '|'. $_SERVER['HTTP_X_FORWARDED'];
 }
-if(isset($_SERVER['HTTP_FORWARDED'])){
+if (isset($_SERVER['HTTP_FORWARDED'])){
     $user_combined_ip .=  '|'. $_SERVER['HTTP_FORWARDED'];
 }
-if(isset($_SERVER['HTTP_CF_CONNECTING_IP'])){
+if (isset($_SERVER['HTTP_CF_CONNECTING_IP'])){
     if(!empty($_SERVER['HTTP_CF_CONNECTING_IP'])){
       $user_combined_ip = $_SERVER['HTTP_CF_CONNECTING_IP'];
     }
 }
 
-if(!isset($_SESSION['user_combined_ip'])){
+if (!isset($_SESSION['user_combined_ip'])){
     $_SESSION['user_combined_ip'] = $user_combined_ip;
 }
 
 // Checking user to use session from the same IP he has been logged in
-if($_SESSION['user_combined_ip'] != $user_combined_ip && $_SERVER['REMOTE_ADDR'] != '127.0.0.1'){
+if ($_SESSION['user_combined_ip'] != $user_combined_ip && $_SERVER['REMOTE_ADDR'] != '127.0.0.1'){
     $v_user = escapeshellarg($_SESSION['user']);
     $v_murmur = escapeshellarg($_SESSION['MURMUR']);
     exec(HESTIA_CMD."v-log-user-logout ".$v_user." ".$v_murmur, $output, $return_var);
@@ -74,17 +74,17 @@ if (isset($_SESSION['user'])) {
     }
 }
 
-if( NO_AUTH_REQUIRED !== true){
-    if(empty($_SESSION['LAST_ACTIVITY']) || empty($_SESSION['INACTIVE_SESSION_TIMEOUT'])){
+if (!defined('NO_AUTH_REQUIRED')){
+    if (empty($_SESSION['LAST_ACTIVITY']) || empty($_SESSION['INACTIVE_SESSION_TIMEOUT'])){
         session_destroy();
         header("Location: /login/");
-    }else if ($_SESSION['INACTIVE_SESSION_TIMEOUT'] * 60 + $_SESSION['LAST_ACTIVITY'] < time()) {
+    } else if ($_SESSION['INACTIVE_SESSION_TIMEOUT'] * 60 + $_SESSION['LAST_ACTIVITY'] < time()) {
         $v_user = escapeshellarg($_SESSION['user']);
         $v_murmur = escapeshellarg($_SESSION['MURMUR']);
         exec(HESTIA_CMD."v-log-user-logout ".$v_user." ".$v_murmur, $output, $return_var);
         session_destroy();
         header("Location: /login/");
-    }else{
+    } else {
         $_SESSION['LAST_ACTIVITY'] = time();
     }
 }