nilsteampassnet / TeamPass

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;

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/main.queries.php

Spacing +7 added lines, -7 removed lines

@@ -208,7 +208,7 @@ 
             } elseif (null !== filter_input(INPUT_POST, 'change_pw_origine', FILTER_SANITIZE_STRING)
                 && ((filter_input(INPUT_POST, 'change_pw_origine', FILTER_SANITIZE_STRING) === "admin_change"
                     || filter_input(INPUT_POST, 'change_pw_origine', FILTER_SANITIZE_STRING) === "user_change"
-                    ) && ($_SESSION['user_admin'] === "1"|| $_SESSION['user_manager'] === "1"
+                    ) && ($_SESSION['user_admin'] === "1" || $_SESSION['user_manager'] === "1"
                     || $_SESSION['user_can_manage_all_users'] === "1")
                 )
             ) {
@@ -1249,10 +1249,10 @@ 
 
                     // Identify url to anonymize it
                     if (strpos($line, 'cpassman_url') > 0 && empty($url_found) === true) {
-                        $url_found = substr($line, 19, strlen($line) - 22);//echo $url_found." ; ";
+                        $url_found = substr($line, 19, strlen($line) - 22); //echo $url_found." ; ";
                         $tmp = parse_url($url_found);
-                        $anonym_url = $tmp['scheme'] . '://<anonym_url>' . $tmp['path'];
-                        $line = "'cpassman_url' => '" . $anonym_url . "\n";
+                        $anonym_url = $tmp['scheme'].'://<anonym_url>'.$tmp['path'];
+                        $line = "'cpassman_url' => '".$anonym_url."\n";
                     }
 
                     // Anonymize all urls
@@ -1319,7 +1319,7 @@ 
 
 **Teampass configuration file:**
 ```
-" . $list_of_options . "
+" . $list_of_options."
 ```
 
 **Updated from an older Teampass or fresh install:**
@@ -1334,12 +1334,12 @@ 
 
 #### Web server error log
 ```
-" . $err['message']." - ".$err['file']." (".$err['line'] .")
+" . $err['message']." - ".$err['file']." (".$err['line'].")
 ```
 
 #### Teampass 10 last system errors
 ```
-" . $teampass_errors ."
+" . $teampass_errors."
 ```
 
 #### Log from the web-browser developer console (CTRL + SHIFT + i)

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

backups/script.backup.php

Spacing +4 added lines, -4 removed lines

@@ -12,15 +12,15 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-include dirname(__FILE__) .'/../includes/config/settings.php';
-require_once dirname(__FILE__) .'/../includes/config/tp.config.php';
+include dirname(__FILE__).'/../includes/config/settings.php';
+require_once dirname(__FILE__).'/../includes/config/tp.config.php';
 header("Content-type: text/html; charset=utf-8");
 
 $_SESSION['CPM'] = 1;
 
 // connect to DB
-require_once $SETTINGS['cpassman_dir'] .'/sources/SplClassLoader.php';
-require_once $SETTINGS['cpassman_dir'] .'/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 
 // Load libraries
 require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';

sources/admin.queries.php

Spacing +7 added lines, -7 removed lines

@@ -740,7 +740,7 @@ 
             $objects = explode(",", $post_object);
 
             // Allowed values for $_POST['object'] : "items,logs,files,categories"
-            if (in_array($objects[0], array("items","logs","files","categories")) === false) {
+            if (in_array($objects[0], array("items", "logs", "files", "categories")) === false) {
                 echo '[{"nextAction":"" , "error":"Input `'.$objects[0].'` is not allowed" , "nbOfItems":""}]';
                 break;
             }
@@ -1305,7 +1305,7 @@ 
             foreach ($rows as $record) {
                 if (is_file($SETTINGS['path_to_upload_folder'].'/'.$record['file'])) {
                     $addFile = 0;
-                    if ($post_option== "decrypt" && $record['status'] === 'encrypted') {
+                    if ($post_option == "decrypt" && $record['status'] === 'encrypted') {
                         $addFile = 1;
                     } elseif ($post_option == "encrypt" && $record['status'] === 'clear') {
                         $addFile = 1;
@@ -2112,16 +2112,16 @@ 
                         );
 
                         $debug_ldap .= 'Search filter (group): '.$filter_group."<br/>".
-                          'Results : '.str_replace("\n","<br>", print_r(ldap_get_entries($ldapconn, $result_group), true))."<br/>";
+                          'Results : '.str_replace("\n", "<br>", print_r(ldap_get_entries($ldapconn, $result_group), true))."<br/>";
 
                         if ($result_group) {
                             $entries = ldap_get_entries($ldapconn, $result_group);
 
                             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;
                                   }
@@ -2134,7 +2134,7 @@ 
                     }
 
                     $debug_ldap .= 'Search filter : '.$filter."<br/>".
-                            'Results : '.str_replace("\n","<br>", print_r(ldap_get_entries($ldapconn, $result), true))."<br/>";
+                            'Results : '.str_replace("\n", "<br>", print_r(ldap_get_entries($ldapconn, $result), true))."<br/>";
 
                     if (ldap_count_entries($ldapconn, $result)) {
                         // try auth

sources/identify.php

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