nilsteampassnet / TeamPass

sources/identify.php

Braces +1 added lines, -1 removed lines

@@ -331,7 +331,7 @@
 		}
 		$passwordClear = $_SERVER['PHP_AUTH_PW'];
 		$pwdOldEncryption = encryptOld($_SERVER['PHP_AUTH_PW']);
-	}else{
+	} else{
 		$passwordClear = htmlspecialchars_decode($dataReceived['pw']);
 		$pwdOldEncryption = encryptOld(htmlspecialchars_decode($dataReceived['pw']));
 		$username = $antiXss->xss_clean(htmlspecialchars_decode($dataReceived['login']));

Indentation +14 added lines, -14 removed lines

@@ -321,26 +321,26 @@
     $dataReceived = prepareExchangedData($sentData, "decode");
 
     // prepare variables
-	if (isset($SETTINGS['enable_http_request_login']) === true
+    if (isset($SETTINGS['enable_http_request_login']) === true
         && $SETTINGS['enable_http_request_login'] === '1'
         && isset($_SERVER['PHP_AUTH_USER']) === true
         && !(isset($SETTINGS['maintenance_mode']) === true
         && $SETTINGS['maintenance_mode'] === '1')
     ) {
         if (strpos($_SERVER['PHP_AUTH_USER'], '@') !== false) {
-			$username = explode("@", $_SERVER['PHP_AUTH_USER'])[0];
-		} elseif (strpos($_SERVER['PHP_AUTH_USER'], '\\') !== false) {
-			$username = explode("\\", $_SERVER['PHP_AUTH_USER'])[1];
-		} else {
-			$username = $_SERVER['PHP_AUTH_USER'];
-		}
-		$passwordClear = $_SERVER['PHP_AUTH_PW'];
-		$pwdOldEncryption = encryptOld($_SERVER['PHP_AUTH_PW']);
-	}else{
-		$passwordClear = htmlspecialchars_decode($dataReceived['pw']);
-		$pwdOldEncryption = encryptOld(htmlspecialchars_decode($dataReceived['pw']));
-		$username = $antiXss->xss_clean(htmlspecialchars_decode($dataReceived['login']));
-	}
+            $username = explode("@", $_SERVER['PHP_AUTH_USER'])[0];
+        } elseif (strpos($_SERVER['PHP_AUTH_USER'], '\\') !== false) {
+            $username = explode("\\", $_SERVER['PHP_AUTH_USER'])[1];
+        } else {
+            $username = $_SERVER['PHP_AUTH_USER'];
+        }
+        $passwordClear = $_SERVER['PHP_AUTH_PW'];
+        $pwdOldEncryption = encryptOld($_SERVER['PHP_AUTH_PW']);
+    }else{
+        $passwordClear = htmlspecialchars_decode($dataReceived['pw']);
+        $pwdOldEncryption = encryptOld(htmlspecialchars_decode($dataReceived['pw']));
+        $username = $antiXss->xss_clean(htmlspecialchars_decode($dataReceived['login']));
+    }
     $logError = "";
     $userPasswordVerified = false;
 

Spacing +1 added lines, -1 removed lines

@@ -336,7 +336,7 @@
 		}
 		$passwordClear = $_SERVER['PHP_AUTH_PW'];
 		$pwdOldEncryption = encryptOld($_SERVER['PHP_AUTH_PW']);
-	}else{
+	} else {
 		$passwordClear = htmlspecialchars_decode($dataReceived['pw']);
 		$pwdOldEncryption = encryptOld(htmlspecialchars_decode($dataReceived['pw']));
 		$username = $antiXss->xss_clean(htmlspecialchars_decode($dataReceived['login']));

index.php

Indentation +9 added lines, -9 removed lines

@@ -700,20 +700,20 @@
             && $SETTINGS['maintenance_mode'] === '1')
         ) {
             if (strpos($_SERVER['PHP_AUTH_USER'], '@') !== false) {
-				$username = explode("@", $_SERVER['PHP_AUTH_USER'])[0];
-			} elseif (strpos($_SERVER['PHP_AUTH_USER'], '\\') !== false) {
-				$username = explode("\\", $_SERVER['PHP_AUTH_USER'])[1];
-			} else {
-				$username = $_SERVER['PHP_AUTH_USER'];
-			}
-			echo '
+                $username = explode("@", $_SERVER['PHP_AUTH_USER'])[0];
+            } elseif (strpos($_SERVER['PHP_AUTH_USER'], '\\') !== false) {
+                $username = explode("\\", $_SERVER['PHP_AUTH_USER'])[1];
+            } else {
+                $username = $_SERVER['PHP_AUTH_USER'];
+            }
+            echo '
         				<div style="margin-bottom:3px;">
         			        <label for="login" class="form_label">', isset($SETTINGS['custom_login_text']) && !empty($SETTINGS['custom_login_text']) ? (string) $SETTINGS['custom_login_text'] : $LANG['index_login'], '</label>
         		            <input type="text" size="10" id="login" name="login" class="input_text text ui-widget-content ui-corner-all" value="' , $username , '" readonly />
         		            <span id="login_check_wait" style="display:none; float:right;"><i class="fa fa-cog fa-spin fa-1x"></i></span>
                         </div>';
-		} else {
-        	echo '
+        } else {
+            echo '
                     	    <div style="margin-bottom:3px;">
                     	        <label for="login" class="form_label">', isset($SETTINGS['custom_login_text']) && !empty($SETTINGS['custom_login_text']) ? (string) $SETTINGS['custom_login_text'] : $LANG['index_login'], '</label>
                                 <input type="text" size="10" id="login" name="login" class="input_text text ui-widget-content ui-corner-all" value="', empty($post_login) === false ? $post_login : '', '" />

Spacing +30 added lines, -33 removed lines

@@ -91,34 +91,34 @@ 
 require_once $SETTINGS['cpassman_dir'].'/sources/core.php';
 
 // Prepare POST variables
-$post_language =        filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
-$post_sig_response =    filter_input(INPUT_POST, 'sig_response', FILTER_SANITIZE_STRING);
-$post_duo_login =       filter_input(INPUT_POST, 'duo_login', FILTER_SANITIZE_STRING);
-$post_duo_data =        filter_input(INPUT_POST, 'duo_data', FILTER_SANITIZE_STRING);
-$post_login =           filter_input(INPUT_POST, 'login', FILTER_SANITIZE_STRING);
-$post_pw =              filter_input(INPUT_POST, 'pw', FILTER_SANITIZE_STRING);
+$post_language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
+$post_sig_response = filter_input(INPUT_POST, 'sig_response', FILTER_SANITIZE_STRING);
+$post_duo_login = filter_input(INPUT_POST, 'duo_login', FILTER_SANITIZE_STRING);
+$post_duo_data = filter_input(INPUT_POST, 'duo_data', FILTER_SANITIZE_STRING);
+$post_login = filter_input(INPUT_POST, 'login', FILTER_SANITIZE_STRING);
+$post_pw = filter_input(INPUT_POST, 'pw', FILTER_SANITIZE_STRING);
 
 // Prepare superGlobal variables
-$session_user_language =        $superGlobal->get("user_language", "SESSION");
-$session_user_id =              $superGlobal->get("user_id", "SESSION");
-$session_user_flag =            $superGlobal->get("user_language_flag", "SESSION");
-$session_user_admin =           $superGlobal->get("user_admin", "SESSION");
+$session_user_language = $superGlobal->get("user_language", "SESSION");
+$session_user_id = $superGlobal->get("user_id", "SESSION");
+$session_user_flag = $superGlobal->get("user_language_flag", "SESSION");
+$session_user_admin = $superGlobal->get("user_admin", "SESSION");
 $session_user_human_resources = $superGlobal->get("user_can_manage_all_users", "SESSION");
-$session_user_avatar_thumb =    $superGlobal->get("user_avatar_thumb", "SESSION");
-$session_name =                 $superGlobal->get("name", "SESSION");
-$session_lastname =             $superGlobal->get("lastname", "SESSION");
-$session_user_manager =         $superGlobal->get("user_manager", "SESSION");
-$session_user_read_only =       $superGlobal->get("user_read_only", "SESSION");
-$session_is_admin =             $superGlobal->get("is_admin", "SESSION");
-$session_login =                $superGlobal->get("login", "SESSION");
-$session_validite_pw =          $superGlobal->get("validite_pw", "SESSION");
-$session_nb_folders =           $superGlobal->get("nb_folders", "SESSION");
-$session_nb_roles =             $superGlobal->get("nb_roles", "SESSION");
-$session_autoriser =            $superGlobal->get("autoriser", "SESSION");
-$session_hide_maintenance =     $superGlobal->get("hide_maintenance", "SESSION");
-$session_initial_url =          $superGlobal->get("initial_url", "SESSION");
-$server_request_uri =           $superGlobal->get("REQUEST_URI", "SERVER");
-$session_nb_users_online =      $superGlobal->get("nb_users_online", "SESSION");
+$session_user_avatar_thumb = $superGlobal->get("user_avatar_thumb", "SESSION");
+$session_name = $superGlobal->get("name", "SESSION");
+$session_lastname = $superGlobal->get("lastname", "SESSION");
+$session_user_manager = $superGlobal->get("user_manager", "SESSION");
+$session_user_read_only = $superGlobal->get("user_read_only", "SESSION");
+$session_is_admin = $superGlobal->get("is_admin", "SESSION");
+$session_login = $superGlobal->get("login", "SESSION");
+$session_validite_pw = $superGlobal->get("validite_pw", "SESSION");
+$session_nb_folders = $superGlobal->get("nb_folders", "SESSION");
+$session_nb_roles = $superGlobal->get("nb_roles", "SESSION");
+$session_autoriser = $superGlobal->get("autoriser", "SESSION");
+$session_hide_maintenance = $superGlobal->get("hide_maintenance", "SESSION");
+$session_initial_url = $superGlobal->get("initial_url", "SESSION");
+$server_request_uri = $superGlobal->get("REQUEST_URI", "SERVER");
+$session_nb_users_online = $superGlobal->get("nb_users_online", "SESSION");
 
 
 /* DEFINE WHAT LANGUAGE TO USE */
@@ -239,10 +239,7 @@ 
         <div style="float:right; margin:-10px 5px 0 0; color:#FFF;">'
             .$LANG['index_welcome'].'&nbsp;<b>'.$session_name.'&nbsp;'.$session_lastname
             .'&nbsp;['.$session_login.']</b>&nbsp;-&nbsp;'
-            , $session_user_admin === '1' ? $LANG['god'] :
-                ($session_user_manager === '1' ? $LANG['gestionnaire'] :
-                    ($session_user_read_only === '1' ? $LANG['read_only_account'] :
-                        ($session_user_human_resources === '1' ? $LANG['human_resources'] :$LANG['user'])
+            , $session_user_admin === '1' ? $LANG['god'] : ($session_user_manager === '1' ? $LANG['gestionnaire'] : ($session_user_read_only === '1' ? $LANG['read_only_account'] : ($session_user_human_resources === '1' ? $LANG['human_resources'] : $LANG['user'])
                     )
                 ), '&nbsp;'.strtolower($LANG['index_login']).'</div>';
 
@@ -709,7 +706,7 @@ 
 			echo '
         				<div style="margin-bottom:3px;">
         			        <label for="login" class="form_label">', isset($SETTINGS['custom_login_text']) && !empty($SETTINGS['custom_login_text']) ? (string) $SETTINGS['custom_login_text'] : $LANG['index_login'], '</label>
-        		            <input type="text" size="10" id="login" name="login" class="input_text text ui-widget-content ui-corner-all" value="' , $username , '" readonly />
+        		            <input type="text" size="10" id="login" name="login" class="input_text text ui-widget-content ui-corner-all" value="' , $username, '" readonly />
         		            <span id="login_check_wait" style="display:none; float:right;"><i class="fa fa-cog fa-spin fa-1x"></i></span>
                         </div>';
 		} else {
@@ -733,7 +730,7 @@ 
                         </div>';
         }
 
-        if (!(isset($SETTINGS['enable_http_request_login']) === true && $SETTINGS['enable_http_request_login'] === '1' && isset($_SERVER['PHP_AUTH_USER']) === true   && !(isset($SETTINGS['maintenance_mode']) === true && $SETTINGS['maintenance_mode'] === '1')) ) {
+        if (!(isset($SETTINGS['enable_http_request_login']) === true && $SETTINGS['enable_http_request_login'] === '1' && isset($_SERVER['PHP_AUTH_USER']) === true && !(isset($SETTINGS['maintenance_mode']) === true && $SETTINGS['maintenance_mode'] === '1'))) {
             echo '
                         <div id="connect_pw" style="margin-bottom:3px;">
                             <label for="pw" class="form_label" id="user_pwd">'.$LANG['index_password'].'</label>
@@ -788,7 +785,7 @@ 
         	<script>
         		var seconds = 3;
         		function updateLogonButton(timeToGo){
-				    document.getElementById("but_identify_user").value = "' . $LANG['duration_login_attempt'] . ' " + timeToGo;
+				    document.getElementById("but_identify_user").value = "' . $LANG['duration_login_attempt'].' " + timeToGo;
 				}
 				$( window ).on( "load", function() {
 				    updateLogonButton(seconds);
@@ -842,7 +839,7 @@ 
             <a href="https://www.reddit.com/r/TeamPass/" target="_blank" style="color:#F0F0F0;" class="tip" title="'.addslashes($LANG['admin_help']).'"><i class="fa fa-reddit-alien"></i></a>
             &nbsp;
             ', ($session_user_id !== null && empty($session_user_id) === false) ? '
-            <a href="#" style="color:#F0F0F0;" class="tip" title="'.addslashes($LANG['bugs_page']).'" onclick="generateBugReport()"><i class="fa fa-bug"></i></a>' : '' ,'
+            <a href="#" style="color:#F0F0F0;" class="tip" title="'.addslashes($LANG['bugs_page']).'" onclick="generateBugReport()"><i class="fa fa-bug"></i></a>' : '', '
         </div>
         <div style="float:left;width:32%;text-align:center;">
             ', ($session_user_id !== null && empty($session_user_id) === false) ? '<i class="fa fa-users"></i>&nbsp;'.$session_nb_users_online.'&nbsp;'.$LANG['users_online'].'&nbsp;|&nbsp;<i class="fa fa-hourglass-end"></i>&nbsp;'.$LANG['index_expiration_in'].'&nbsp;<div style="display:inline;" id="countdown"></div>' : '', '

includes/language/english.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 global $LANG;
-$LANG = array (
+$LANG = array(
     'enable_http_request_login' => 'Automatic login using http header credentials',
     'duration_login_attempt' => 'Seconds till auto login:',
     'newly_created_user_role' => 'Newly created user has role',