nilsteampassnet / TeamPass

includes/libraries/Authentication/DuoSecurity/Duo.php

Spacing +6 added lines, -6 removed lines

@@ -27,12 +27,12 @@ 
     private static function signVals($key, $vals, $prefix, $expire, $time = null)
     {
         $exp = ($time ? $time : time()) + $expire;
-        $val = $vals . '|' . $exp;
+        $val = $vals.'|'.$exp;
         $b64 = base64_encode($val);
-        $cookie = $prefix . '|' . $b64;
+        $cookie = $prefix.'|'.$b64;
 
         $sig = hash_hmac("sha1", $cookie, $key);
-        return $cookie . '|' . $sig;
+        return $cookie.'|'.$sig;
     }
 
     private static function parseVals($key, $val, $prefix, $ikey, $time = null)
@@ -45,7 +45,7 @@ 
         }
         list($u_prefix, $u_b64, $u_sig) = $parts;
 
-        $sig = hash_hmac("sha1", $u_prefix . '|' . $u_b64, $key);
+        $sig = hash_hmac("sha1", $u_prefix.'|'.$u_b64, $key);
         if (hash_hmac("sha1", $sig, $key) !== hash_hmac("sha1", $u_sig, $key)) {
             return null;
         }
@@ -88,12 +88,12 @@ 
             return self::ERR_AKEY;
         }
 
-        $vals = $username . '|' . $ikey;
+        $vals = $username.'|'.$ikey;
 
         $duo_sig = self::signVals($skey, $vals, self::DUO_PREFIX, self::DUO_EXPIRE, $time);
         $app_sig = self::signVals($akey, $vals, self::APP_PREFIX, self::APP_EXPIRE, $time);
 
-        return $duo_sig . ':' . $app_sig;
+        return $duo_sig.':'.$app_sig;
     }
 
     public static function verifyResponse($ikey, $skey, $akey, $sig_response, $time = null)

index.php

Spacing +26 added lines, -28 removed lines

@@ -91,33 +91,33 @@ 
 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_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_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_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 */
@@ -237,9 +237,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'] : $LANG['user'])
+            , $session_user_admin === '1' ? $LANG['god'] : ($session_user_manager === '1' ? $LANG['gestionnaire'] : ($session_user_read_only === '1' ? $LANG['read_only_account'] : $LANG['user'])
                 ), '&nbsp;'.strtolower($LANG['index_login']).'</div>';
 
         echo '