nilsteampassnet / TeamPass

sources/find.queries.php

Spacing +2 added lines, -2 removed lines

@@ -341,8 +341,8 @@
         if ($getItemInList === true) {
             $sOutputConst .= $sOutputItem;
         } else {
-            $iFilteredTotal --;
-            $iTotal --;
+            $iFilteredTotal--;
+            $iTotal--;
         }
     }
     if (!empty($sOutputConst)) {

admin.settings.load.php

Spacing +7 added lines, -7 removed lines

@@ -205,9 +205,9 @@ 
                     if (val[4] !== "") {
                         newList += '<span id="encryt_data_'+val[1]+'" style="margin-left:4px; cursor:pointer;">';
                         if (val[4] === "1") {
-                            newList += '<i class="fa fa-key tip" title="<?php echo $LANG['encrypted_data'];?>" onclick="changeEncrypMode('+val[1]+', 1)"></i>';
+                            newList += '<i class="fa fa-key tip" title="<?php echo $LANG['encrypted_data']; ?>" onclick="changeEncrypMode('+val[1]+', 1)"></i>';
                         } else if (val[4] === "0") {
-                            newList += '<span class="fa-stack" title="<?php echo $LANG['not_encrypted_data'];?>" onclick="changeEncrypMode('+val[1]+', 0)"><i class="fa fa-key fa-stack-1x"></i><i class="fa fa-ban fa-stack-1x fa-lg" style="color:red;"></i></span>';
+                            newList += '<span class="fa-stack" title="<?php echo $LANG['not_encrypted_data']; ?>" onclick="changeEncrypMode('+val[1]+', 0)"><i class="fa fa-key fa-stack-1x"></i><i class="fa fa-ban fa-stack-1x fa-lg" style="color:red;"></i></span>';
                         }
                         newList += '</span>'
                     }
@@ -215,9 +215,9 @@ 
                     if (val[6] !== "") {
                         newList += '<span style="margin-left:4px;">';
                         if (val[6] === "text") {
-                            newList += '<i class="fa fa-paragraph tip" title="<?php echo $LANG['data_is_text'];?>"></i>';
+                            newList += '<i class="fa fa-paragraph tip" title="<?php echo $LANG['data_is_text']; ?>"></i>';
                         } else if (val[6] === "masked") {
-                            newList += '<i class="fa fa-eye-slash tip" title="<?php echo $LANG['data_is_masked'];?>"></i>';
+                            newList += '<i class="fa fa-eye-slash tip" title="<?php echo $LANG['data_is_masked']; ?>"></i>';
                         }
                         newList += '</span>'
                     }
@@ -1028,8 +1028,8 @@ 
         function(data) {
             data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key']; ?>");
 
-            var html_admin_by = '<option value="">-- <?php echo addslashes($LANG['select']);?> --</option>',
-                html_roles = '<option value="">-- <?php echo addslashes($LANG['select']);?> --</option>',
+            var html_admin_by = '<option value="">-- <?php echo addslashes($LANG['select']); ?> --</option>',
+                html_roles = '<option value="">-- <?php echo addslashes($LANG['select']); ?> --</option>',
                 selected_admin_by = 0,
                 selected_role = 0;
 
@@ -1040,7 +1040,7 @@ 
                 if (data[i].selected_role === 1) {
                     selected_role = data[i].id;
                 }
-                html_admin_by += '<option value="'+data[i].id+'"><?php echo addslashes($LANG['managers_of']." ");?>'+data[i].title+'</option>';
+                html_admin_by += '<option value="'+data[i].id+'"><?php echo addslashes($LANG['managers_of']." "); ?>'+data[i].title+'</option>';
                 html_roles += '<option value="'+data[i].id+'">'+data[i].title+'</option>';
             }
             $("#ldap_new_user_is_administrated_by").append(html_admin_by);

api/functions.php

Spacing +3 added lines, -3 removed lines

@@ -633,7 +633,7 @@ 
                             $json[$inc]['nlevel'] = mb_convert_encoding($folder->nlevel, mb_detect_encoding($folder->nlevel), 'UTF-8');
                             $json[$inc]['personal'] = mb_convert_encoding($folder->personal_folder, mb_detect_encoding($folder->personal_folder), 'UTF-8');
 
-                            $inc ++;
+                            $inc++;
                         }
                     }
                 }
@@ -2099,7 +2099,7 @@ 
                         $tree = new Tree\NestedTree\NestedTree(prefix_table("nested_tree"), 'id', 'parent_id', 'title');
                         $tree->rebuild();
 
-                        echo json_encode(array('new_id' => $newID , 'err' => ''));
+                        echo json_encode(array('new_id' => $newID, 'err' => ''));
                     } elseif ($GLOBALS['request'][1] === "edit") {
                         // Is this folder a personal one?
                         $fldData = DB::queryFirstRow(
@@ -2166,7 +2166,7 @@ 
                             $item_definition['item_id']
                         );
 
-                        echo json_encode(array('new_id' => '' , 'err' => ''));
+                        echo json_encode(array('new_id' => '', 'err' => ''));
                     }
                 } else {
                     rest_error('AUTH_NOT_GRANTED');

index.php

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 = 1;
 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);
@@ -845,7 +842,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/french.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(
     'report_a_bug' => 'Reporter un défaut',
     'user_profile_api_key' => 'Votre clé API',
     'settings_ldap_and_local_authentication' => 'Utilisateurs locaux et LDAP',

includes/language/catalan.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(
     'report_a_bug' => 'Report a Bug',
     'user_profile_api_key' => 'Your API key',
     'settings_ldap_and_local_authentication' => 'Local and LDAP users',

includes/language/dutch.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(
     'report_a_bug' => 'Report a Bug',
     'user_profile_api_key' => 'Your API key',
     'user_ga_code' => 'E-mail Google Authenticatie naar gebruiker',

includes/language/portuguese_br.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(
     'report_a_bug' => 'Report a Bug',
     'user_profile_api_key' => 'Your API key',
     'user_ga_code' => 'Enviar ao usuário o Código do Google Authenticator por e-mail',

includes/language/spanish.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(
     'report_a_bug' => 'Report a Bug',
     'user_profile_api_key' => 'Your API key',
     'user_ga_code' => 'Enviar el código de GoogleAuthenticator por correo al usuario',