nilsteampassnet / TeamPass

items.load.php

Spacing +20 added lines, -20 removed lines

@@ -457,28 +457,28 @@ 
 
         // Prepare error message
         if (value.pw_status === "encryption_error") {
-            pwd_error = '<span class="fa fa-warning fa-sm mi-red tip" title="<?php echo addslashes($LANG['pw_encryption_error']);?>"></span>&nbsp;';
+            pwd_error = '<span class="fa fa-warning fa-sm mi-red tip" title="<?php echo addslashes($LANG['pw_encryption_error']); ?>"></span>&nbsp;';
         }
 
         // Prepare anyone can modify icon
         if (value.anyone_can_modify === "1") {
-            icon_all_can_modify = '<span class="fa fa-pencil fa-sm mi-grey-1 pointer tip" title="<?php echo addslashes($LANG['item_menu_collab_enable']);?>" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \''+value.open_edit+'\', \''+value.reload+'\', \''+value.tree_id+'\')"></span>&nbsp;&nbsp;';
+            icon_all_can_modify = '<span class="fa fa-pencil fa-sm mi-grey-1 pointer tip" title="<?php echo addslashes($LANG['item_menu_collab_enable']); ?>" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \''+value.open_edit+'\', \''+value.reload+'\', \''+value.tree_id+'\')"></span>&nbsp;&nbsp;';
         }
 
         // Prepare mini icons
         if (value.copy_to_clipboard_small_icons === "1" && value.display_item === 1) {
             // Login icon
             if (value.login !== "") {
-                icon_login = '<span class="fa fa-sm fa-user mi-black mini_login" data-clipboard-text="'+sanitizeString(value.login)+'" title="<?php echo addslashes($LANG['item_menu_copy_login']);?>" id="minilogin_'+value.item_id+'"></span>&nbsp;';
+                icon_login = '<span class="fa fa-sm fa-user mi-black mini_login" data-clipboard-text="'+sanitizeString(value.login)+'" title="<?php echo addslashes($LANG['item_menu_copy_login']); ?>" id="minilogin_'+value.item_id+'"></span>&nbsp;';
             }
             // Pwd icon
             if (value.pw !== "") {
-                icon_pwd = '<span class="fa fa-sm fa-lock mi-black mini_pw" data-clipboard-text="'+sanitizeString(value.pw)+'" title="<?php echo addslashes($LANG['item_menu_copy_pw']);?>" data-clipboard-id="'+value.item_id+'" id="minipwd_'+value.item_id+'"></span>&nbsp;';
+                icon_pwd = '<span class="fa fa-sm fa-lock mi-black mini_pw" data-clipboard-text="'+sanitizeString(value.pw)+'" title="<?php echo addslashes($LANG['item_menu_copy_pw']); ?>" data-clipboard-id="'+value.item_id+'" id="minipwd_'+value.item_id+'"></span>&nbsp;';
             }
 
             // Now check if pwd is empty. If it is then warn user
             if (value.pw === "") {
-                pwd_error = '&nbsp;<span class="fa fa-exclamation-circle fa-sm mi-yellow tip" title="<?php echo addslashes($LANG['password_is_empty']);?>"></span>&nbsp;';
+                pwd_error = '&nbsp;<span class="fa fa-exclamation-circle fa-sm mi-yellow tip" title="<?php echo addslashes($LANG['password_is_empty']); ?>"></span>&nbsp;';
             }
         }
 
@@ -2375,8 +2375,8 @@ 
         $("#delete-edit-file_"+file_id)
             .hide()
             .after(
-                '<span class="delete_me">&nbsp;<span id="confirm-delete-edit-file_'+file_id+'" class="fa fa-thumbs-up tip" style="cursor:pointer;" onclick="delete_attached_file('+file_id+', 1)" title="<?php echo addslashes($LANG['confirm']);?>"></span>' +
-                '&nbsp;<span id="cancel-delete-edit-file_'+file_id+'" class="fa fa-thumbs-down tip" style="cursor:pointer;" onclick="cancel_delete_attached_file('+file_id+')" title="<?php echo addslashes($LANG['cancel']);?>"></span>&nbsp;</span>'
+                '<span class="delete_me">&nbsp;<span id="confirm-delete-edit-file_'+file_id+'" class="fa fa-thumbs-up tip" style="cursor:pointer;" onclick="delete_attached_file('+file_id+', 1)" title="<?php echo addslashes($LANG['confirm']); ?>"></span>' +
+                '&nbsp;<span id="cancel-delete-edit-file_'+file_id+'" class="fa fa-thumbs-down tip" style="cursor:pointer;" onclick="cancel_delete_attached_file('+file_id+')" title="<?php echo addslashes($LANG['cancel']); ?>"></span>&nbsp;</span>'
             );
             $(".tip").tooltipster({multiple: true});
     }
@@ -2597,9 +2597,9 @@ 
 
                 // Shall we show the root folder
                 if (data.html_json.can_create_root_folder === 1) {
-                    html_visible = '<option value="0"><?php echo addslashes($LANG['root']);?></option>';
-                    html_full_visible = '<option value="0"><?php echo addslashes($LANG['root']);?></option>';
-                    html_active_visible = '<option value="0"><?php echo addslashes($LANG['root']);?></option>';
+                    html_visible = '<option value="0"><?php echo addslashes($LANG['root']); ?></option>';
+                    html_full_visible = '<option value="0"><?php echo addslashes($LANG['root']); ?></option>';
+                    html_active_visible = '<option value="0"><?php echo addslashes($LANG['root']); ?></option>';
                 }
 
                 //
@@ -4529,20 +4529,20 @@ 
                     if (value.copy_to_clipboard_small_icons === 1) {
                         // Prepare Login
                         if (value.login !== "") {
-                            value.login = '<span class="fa fa-user fa-lg mi-black mini_login tip" data-clipboard-text="'+value.login+'" title="<?php echo addslashes($LANG['item_menu_copy_login']);?>"></span>&nbsp;';
+                            value.login = '<span class="fa fa-user fa-lg mi-black mini_login tip" data-clipboard-text="'+value.login+'" title="<?php echo addslashes($LANG['item_menu_copy_login']); ?>"></span>&nbsp;';
                         }
 
                         // Prepare PWD
                         if (value.pw !== "") {
-                            value.pw = '<span class="fa fa-lock fa-lg mi-black mini_pw tip" data-clipboard-text="'+value.pw+'" title="<?php echo addslashes($LANG['item_menu_copy_pw']);?>"></span>&nbsp;'
+                            value.pw = '<span class="fa fa-lock fa-lg mi-black mini_pw tip" data-clipboard-text="'+value.pw+'" title="<?php echo addslashes($LANG['item_menu_copy_pw']); ?>"></span>&nbsp;'
                         }
 
                         // Prepare favorite
                         if (value.enable_favourites === 1) {
                             if (value.is_favorite === 1) {
-                                icon_favorite = '<span class="fa fa-star fa-lg mi-yellow tip" onclick="ActionOnQuickIcon('+value.item_id+',0)" class="tip" title="<?php echo addslashes($LANG['item_menu_del_from_fav']);?>"></span>';
+                                icon_favorite = '<span class="fa fa-star fa-lg mi-yellow tip" onclick="ActionOnQuickIcon('+value.item_id+',0)" class="tip" title="<?php echo addslashes($LANG['item_menu_del_from_fav']); ?>"></span>';
                             } else {
-                                icon_favorite = '<span class="fa fa-star-o fa-lg tip" onclick="ActionOnQuickIcon('+value.item_id+',1)" class="tip" title="<?php echo addslashes($LANG['item_menu_add_to_fav']);?>"></span>';
+                                icon_favorite = '<span class="fa fa-star-o fa-lg tip" onclick="ActionOnQuickIcon('+value.item_id+',1)" class="tip" title="<?php echo addslashes($LANG['item_menu_add_to_fav']); ?>"></span>';
                             }
                         } else {
                             icon_favorite = '';
@@ -4556,7 +4556,7 @@ 
                     // Append
                     $("#full_items_list").append(
                     '<li class="item trunc_line" id="'+value.item_id+'"><a id="fileclass'+value.item_id+'" class="file_search">' +
-                    '<span class="fa fa-key mi-yellow tip" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \''+value.open_edit+'\', \''+value.reload+'\', \''+value.tree_id+'\')" title="<?php echo addslashes($LANG['click_to_edit']);?>"></span>&nbsp;' +
+                    '<span class="fa fa-key mi-yellow tip" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \''+value.open_edit+'\', \''+value.reload+'\', \''+value.tree_id+'\')" title="<?php echo addslashes($LANG['click_to_edit']); ?>"></span>&nbsp;' +
                         '<span class="truncate" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \'\', \''+value.reload+'\', \''+value.tree_id+'\')">'+value.label +
                         value.desc +
                         '&nbsp;<span style="font-size:11px;font-style:italic;"><i class="fa fa-folder-o"></i>&nbsp;'+value.folder+'</span>' +
@@ -4614,20 +4614,20 @@ 
                 if (value.copy_to_clipboard_small_icons === "1") {
                     // Prepare Login
                     if (value.login !== "") {
-                        value.login = '<span class="fa fa-user fa-lg mi-black mini_login tip" data-clipboard-text="'+value.login+'" title="<?php echo addslashes($LANG['item_menu_copy_login']);?>"></span>&nbsp;';
+                        value.login = '<span class="fa fa-user fa-lg mi-black mini_login tip" data-clipboard-text="'+value.login+'" title="<?php echo addslashes($LANG['item_menu_copy_login']); ?>"></span>&nbsp;';
                     }
 
                     // Prepare PWD
                     if (value.pw !== "") {
-                        value.pw = '<span class="fa fa-lock fa-lg mi-black mini_pw tip" data-clipboard-text="'+value.pw+'" title="<?php echo addslashes($LANG['item_menu_copy_pw']);?>"></span>&nbsp;'
+                        value.pw = '<span class="fa fa-lock fa-lg mi-black mini_pw tip" data-clipboard-text="'+value.pw+'" title="<?php echo addslashes($LANG['item_menu_copy_pw']); ?>"></span>&nbsp;'
                     }
 
                     // Prepare favorite
                     if (value.enable_favourites === "1") {
                         if (value.is_favorite === 1) {
-                            icon_favorite = '<span class="fa fa-star fa-lg mi-yellow tip" onclick="ActionOnQuickIcon('+value.item_id+',0)" class="tip" title="<?php echo addslashes($LANG['item_menu_del_from_fav']);?>"></span>';
+                            icon_favorite = '<span class="fa fa-star fa-lg mi-yellow tip" onclick="ActionOnQuickIcon('+value.item_id+',0)" class="tip" title="<?php echo addslashes($LANG['item_menu_del_from_fav']); ?>"></span>';
                         } else {
-                            icon_favorite = '<span class="fa fa-star-o fa-lg tip" onclick="ActionOnQuickIcon('+value.item_id+',1)" class="tip" title="<?php echo addslashes($LANG['item_menu_add_to_fav']);?>"></span>';
+                            icon_favorite = '<span class="fa fa-star-o fa-lg tip" onclick="ActionOnQuickIcon('+value.item_id+',1)" class="tip" title="<?php echo addslashes($LANG['item_menu_add_to_fav']); ?>"></span>';
                         }
                     } else {
                         icon_favorite = '';
@@ -4641,7 +4641,7 @@ 
                 // Append
                 $("#full_items_list").append(
                 '<li class="item trunc_line" id="'+value.item_id+'"><a id="fileclass'+value.item_id+'" class="file_search">' +
-                '<span class="fa fa-key mi-yellow tip" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \''+value.open_edit+'\', \''+value.reload+'\', \''+value.tree_id+'\')" title="<?php echo addslashes($LANG['click_to_edit']);?>"></span>&nbsp;' +
+                '<span class="fa fa-key mi-yellow tip" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \''+value.open_edit+'\', \''+value.reload+'\', \''+value.tree_id+'\')" title="<?php echo addslashes($LANG['click_to_edit']); ?>"></span>&nbsp;' +
                     '<span class="truncate" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \'\', \''+value.reload+'\', \''+value.tree_id+'\')">'+value.label +
                     value.desc +
                     '&nbsp;<span style="font-size:11px;font-style:italic;"><i class="fa fa-folder-o"></i>&nbsp;'+value.folder+'</span>' +

sources/items.import.php

Spacing +1 added lines, -1 removed lines

@@ -309,7 +309,7 @@
                 BeforeUpload: function (up, file) {
                     $("#import_status_ajax_loader").show();
                     up.settings.multipart_params = {
-                        "PHPSESSID":"<?php echo $_SESSION['user_id'];?>",
+                        "PHPSESSID":"<?php echo $_SESSION['user_id']; ?>",
                         "type_upload":"import_items_from_keypass",
                         "user_token": $("#import_user_token").val()
                     };

sources/main.functions.php

Spacing +3 added lines, -3 removed lines

@@ -769,7 +769,7 @@ 
         }
         // Get IDs of personal folders
         if (isset($SETTINGS['enable_pf_feature']) === true && $SETTINGS['enable_pf_feature'] === '1'
-            && isset($_SESSION['personal_folder']) === true &&  $_SESSION['personal_folder'] === '1'
+            && isset($_SESSION['personal_folder']) === true && $_SESSION['personal_folder'] === '1'
         ) {
             $persoFld = DB::queryfirstrow(
                 "SELECT id
@@ -1925,7 +1925,7 @@ 
     $antiXss = new protect\AntiXSS\AntiXSS();
 
     // Protect against bad inputs
-    if (is_array($source_file) ||is_array($target_file)) {
+    if (is_array($source_file) || is_array($target_file)) {
         return 'error_cannot_be_array';
     }
 
@@ -2082,7 +2082,7 @@ 
     $newArr = array();
 
     foreach ($arr as $key => $value) {
-        $newArr[ $key ] = (is_array($value) ? array_map_r($func, $value) : ( is_array($func) ? call_user_func_array($func, $value) : $func( $value )));
+        $newArr[$key] = (is_array($value) ? array_map_r($func, $value) : (is_array($func) ? call_user_func_array($func, $value) : $func($value)));
     }
 
     return $newArr;

Indentation +10 added lines, -10 removed lines

@@ -18,15 +18,15 @@ 
 
 // Load config if $SETTINGS not defined
 if (!isset($SETTINGS['cpassman_dir']) || empty($SETTINGS['cpassman_dir'])) {
-  if (file_exists('../includes/config/tp.config.php')) {
-      require_once '../includes/config/tp.config.php';
-  } elseif (file_exists('./includes/config/tp.config.php')) {
-      require_once './includes/config/tp.config.php';
-  } elseif (file_exists('../../includes/config/tp.config.php')) {
-      require_once '../../includes/config/tp.config.php';
-  } else {
-      throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
-  }
+    if (file_exists('../includes/config/tp.config.php')) {
+        require_once '../includes/config/tp.config.php';
+    } elseif (file_exists('./includes/config/tp.config.php')) {
+        require_once './includes/config/tp.config.php';
+    } elseif (file_exists('../../includes/config/tp.config.php')) {
+        require_once '../../includes/config/tp.config.php';
+    } else {
+        throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
+    }
 }
 
 // load phpCrypt
@@ -1430,7 +1430,7 @@ 
     // Can we use PHP7 random_int function?
     if (version_compare(phpversion(), '7.0', '>=')) {
         require_once $SETTINGS['cpassman_dir'].'/includes/libraries/PasswordGenerator/RandomGenerator/Php7RandomGenerator.php';
-         $generator->setRandomGenerator(new PasswordGenerator\RandomGenerator\Php7RandomGenerator());
+            $generator->setRandomGenerator(new PasswordGenerator\RandomGenerator\Php7RandomGenerator());
     }
 
     // init

sources/tree.php

Spacing +19 added lines, -19 removed lines

@@ -130,16 +130,16 @@ 
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
     // Prepare superGlobal variables
-    $session_forbiden_pfs =                         $superGlobal->get("forbiden_pfs", "SESSION");
-    $session_groupes_visibles =                     $superGlobal->get("groupes_visibles", "SESSION");
-    $session_list_restricted_folders_for_items =    $superGlobal->get("list_restricted_folders_for_items", "SESSION");
-    $session_user_id =                              $superGlobal->get("user_id", "SESSION");
-    $session_login =                                $superGlobal->get("login", "SESSION");
-    $session_no_access_folders =                    $superGlobal->get("no_access_folders", "SESSION");
-    $session_list_folders_limited =                 $superGlobal->get("list_folders_limited", "SESSION");
-    $session_read_only_folders =                    $superGlobal->get("read_only_folders", "SESSION");
-    $session_personal_folders =                    $superGlobal->get("personal_folders", "SESSION");
-    $session_personal_visible_groups =                    $superGlobal->get("personal_visible_groups", "SESSION");
+    $session_forbiden_pfs = $superGlobal->get("forbiden_pfs", "SESSION");
+    $session_groupes_visibles = $superGlobal->get("groupes_visibles", "SESSION");
+    $session_list_restricted_folders_for_items = $superGlobal->get("list_restricted_folders_for_items", "SESSION");
+    $session_user_id = $superGlobal->get("user_id", "SESSION");
+    $session_login = $superGlobal->get("login", "SESSION");
+    $session_no_access_folders = $superGlobal->get("no_access_folders", "SESSION");
+    $session_list_folders_limited = $superGlobal->get("list_folders_limited", "SESSION");
+    $session_read_only_folders = $superGlobal->get("read_only_folders", "SESSION");
+    $session_personal_folders = $superGlobal->get("personal_folders", "SESSION");
+    $session_personal_visible_groups = $superGlobal->get("personal_visible_groups", "SESSION");
 
     // Be sure that user can only see folders he/she is allowed to
     if (in_array($nodeId, $session_forbiden_pfs) === false
@@ -304,15 +304,15 @@ 
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
     // Prepare superGlobal variables
-    $session_forbiden_pfs =                         $superGlobal->get("forbiden_pfs", "SESSION");
-    $session_groupes_visibles =                     $superGlobal->get("groupes_visibles", "SESSION");
-    $session_list_restricted_folders_for_items =    $superGlobal->get("list_restricted_folders_for_items", "SESSION");
-    $session_user_id =                              $superGlobal->get("user_id", "SESSION");
-    $session_login =                                $superGlobal->get("login", "SESSION");
-    $session_user_read_only =                       $superGlobal->get("user_read_only", "SESSION");
-    $session_no_access_folders =                    $superGlobal->get("no_access_folders", "SESSION");
-    $session_list_folders_limited =                 $superGlobal->get("list_folders_limited", "SESSION");
-    $session_read_only_folders =                    $superGlobal->get("read_only_folders", "SESSION");
+    $session_forbiden_pfs = $superGlobal->get("forbiden_pfs", "SESSION");
+    $session_groupes_visibles = $superGlobal->get("groupes_visibles", "SESSION");
+    $session_list_restricted_folders_for_items = $superGlobal->get("list_restricted_folders_for_items", "SESSION");
+    $session_user_id = $superGlobal->get("user_id", "SESSION");
+    $session_login = $superGlobal->get("login", "SESSION");
+    $session_user_read_only = $superGlobal->get("user_read_only", "SESSION");
+    $session_no_access_folders = $superGlobal->get("no_access_folders", "SESSION");
+    $session_list_folders_limited = $superGlobal->get("list_folders_limited", "SESSION");
+    $session_read_only_folders = $superGlobal->get("read_only_folders", "SESSION");
 
     // Be sure that user can only see folders he/she is allowed to
     if (in_array($completTree[$nodeId]->id, $session_forbiden_pfs) === false

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)) {

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 +21 added lines, -21 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;
 
@@ -438,10 +438,10 @@ 
                 if (($SETTINGS['ldap_bind_dn'] === "" && $SETTINGS['ldap_bind_passwd'] === "") || $ldapbind === true) {
                     $filter = "(&(".$SETTINGS['ldap_user_attribute']."=".$username.")(objectClass=".$SETTINGS['ldap_object_class']."))";
                     $result = ldap_search(
-                      $ldapconn,
-                      $SETTINGS['ldap_search_base'],
-                      $filter,
-                      array('dn', 'mail', 'givenname', 'sn')
+                        $ldapconn,
+                        $SETTINGS['ldap_search_base'],
+                        $filter,
+                        array('dn', 'mail', 'givenname', 'sn')
                     );
                     if ($debugLdap == 1) {
                         fputs(
@@ -488,11 +488,11 @@ 
                                 if ($entries['count'] > 0) {
                                     // Now check if group fits
                                     for ($i=0; $i<$entries['count']; $i++) {
-                                      $parsr=ldap_explode_dn($entries[$i]['dn'], 0);
-                                      if (str_replace(array('CN=','cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) {
+                                        $parsr=ldap_explode_dn($entries[$i]['dn'], 0);
+                                        if (str_replace(array('CN=','cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) {
                                         $GroupRestrictionEnabled = true;
                                         break;
-                                      }
+                                        }
                                     }
 
                                 }

Spacing +4 added lines, -4 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']));
@@ -487,9 +487,9 @@ 
 
                                 if ($entries['count'] > 0) {
                                     // Now check if group fits
-                                    for ($i=0; $i<$entries['count']; $i++) {
-                                      $parsr=ldap_explode_dn($entries[$i]['dn'], 0);
-                                      if (str_replace(array('CN=','cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) {
+                                    for ($i = 0; $i < $entries['count']; $i++) {
+                                      $parsr = ldap_explode_dn($entries[$i]['dn'], 0);
+                                      if (str_replace(array('CN=', 'cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) {
                                         $GroupRestrictionEnabled = true;
                                         break;
                                       }

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);

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 = 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>' : '', '

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');

Indentation +1 added lines, -1 removed lines

@@ -1635,7 +1635,7 @@
                         rest_error('AUTH_NO_URL');
                     }
                 } else {
-                  rest_error('AUTH_NO_IDENTIFIER');
+                    rest_error('AUTH_NO_IDENTIFIER');
                 }
             } else {
                 rest_error('AUTH_NO_IDENTIFIER');