nilsteampassnet / TeamPass

install/upgrade.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
         } elseif (substr_count($val, '$pre = ') > 0) {
             $_SESSION['pre'] = getSettingValue($val);
         } elseif (substr_count($val, "define('SECUREPATH',") > 0) {
-            $_SESSION['sk_file'] = substr($val, 23, strpos($val, ');')-24)."/sk.php";
+            $_SESSION['sk_file'] = substr($val, 23, strpos($val, ');') - 24)."/sk.php";
         }
     }
 }

sources/import.queries.php

Spacing +2 added lines, -2 removed lines

@@ -137,7 +137,7 @@ 
             $config->setIgnoreHeaderLine("true");
             // extract data from CSV file
             $interpreter = new Interpreter();
-            $interpreter->addObserver(function (array $row) use (&$valuesToImport) {
+            $interpreter->addObserver(function(array $row) use (&$valuesToImport) {
                 $valuesToImport[] = array(
                     'Label'     => $row[0],
                     'Login'     => $row[1],
@@ -966,7 +966,7 @@ 
         break;
 }
 
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
     $prefix = 'League\\Csv\\';
     $base_dir = __DIR__.'/src/';
     $len = strlen($prefix);

Indentation +3 added lines, -3 removed lines

@@ -105,7 +105,7 @@ 
         //load full tree
         $tree->rebuild();
         $tree = $tree->getDescendants();
-       // Init post variable
+        // Init post variable
         $post_operation_id = filter_input(INPUT_POST, 'file', FILTER_SANITIZE_NUMBER_INT);
 
         // Get filename from database
@@ -436,7 +436,7 @@ 
         }
 
         /**
-        ** Recursive function that will permit to read each level of XML nodes
+         ** Recursive function that will permit to read each level of XML nodes
          */
         function recursiveKeepassXML($xmlRoot, $xmlLevel = 0)
         {
@@ -586,7 +586,7 @@ 
 
                     //recursive call
                     if ($history !== true) {
-                      recursiveKeepassXML($xmlChildren, $xmlLevel + 1);
+                        recursiveKeepassXML($xmlChildren, $xmlLevel + 1);
                     }
 
                     // Force History to false

sources/core.php

Indentation +2 added lines, -2 removed lines

@@ -85,8 +85,8 @@
     );
     if ($row['valeur'] === "true") {
         /**
-        * Permits to delete files and folders recursively
-        */
+         * Permits to delete files and folders recursively
+         */
         function delTree($dir)
         {
             $files = array_diff(scandir($dir), array('.', '..'));

Spacing +1 added lines, -1 removed lines

@@ -492,7 +492,7 @@
             $_SESSION['validite_pw'] = true;
         } else {
             $_SESSION['numDaysBeforePwExpiration'] = $SETTINGS['pw_life_duration'] - round(
-                (mktime(0, 0, 0, (int)date('m'), (int)date('d'), (int)date('y')) - $_SESSION['last_pw_change']) / (24 * 60 * 60)
+                (mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y')) - $_SESSION['last_pw_change']) / (24 * 60 * 60)
             );
             if ($_SESSION['numDaysBeforePwExpiration'] <= 0) {
                 $_SESSION['validite_pw'] = false;

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

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

sources/admin.queries.php

Indentation +5 added lines, -5 removed lines

@@ -2085,7 +2085,7 @@ 
             $debug_ldap .= "LDAP connection : ".($ldapconn ? "Connected" : "Failed")."<br/>";
 
             if ($ldapconn) {
-              $debug_ldap .= "DN : ".$dataReceived[0]['ldap_bind_dn']." -- ".$dataReceived[0]['ldap_bind_passwd']."<br/>";
+                $debug_ldap .= "DN : ".$dataReceived[0]['ldap_bind_dn']." -- ".$dataReceived[0]['ldap_bind_passwd']."<br/>";
                 ldap_set_option($ldapconn, LDAP_OPT_PROTOCOL_VERSION, 3);
                 ldap_set_option($ldapconn, LDAP_OPT_REFERRALS, 0);
                 $ldapbind = ldap_bind($ldapconn, $dataReceived[0]['ldap_bind_dn'], $dataReceived[0]['ldap_bind_passwd']);
@@ -2112,7 +2112,7 @@ 
                         );
 
                         $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);
@@ -2120,11 +2120,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 +10 added lines, -10 removed lines

@@ -107,7 +107,7 @@ 
                         array(
                             'http' => array(
                                 'ignore_errors' => true,
-                                'proxy' =>  $SETTINGS['proxy_ip'] . ':' . $SETTINGS['proxy_port']
+                                'proxy' =>  $SETTINGS['proxy_ip'].':'.$SETTINGS['proxy_port']
                             )
                         )
                     );
@@ -665,7 +665,7 @@ 
 
 
         // generate new saltkey
-        $old_sk_filename = SECUREPATH."/teampass-seckey.txt".'.'.date("Y_m_d", mktime(0, 0, 0, (int)date('m'), (int)date('d'), (int)date('y'))).'.'.time();
+        $old_sk_filename = SECUREPATH."/teampass-seckey.txt".'.'.date("Y_m_d", mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))).'.'.time();
         copy(
             SECUREPATH."/teampass-seckey.txt",
             $old_sk_filename
@@ -769,7 +769,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;
             }
@@ -1259,7 +1259,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;
@@ -1551,7 +1551,7 @@ 
                     $tmp_skfile,
                     $tmp_skfile.'.'.date(
                         "Y_m_d",
-                        mktime(0, 0, 0, (int)date('m'), (int)date('d'), (int)date('y'))
+                        mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))
                     )
                 )) {
                     echo '[{"result" : "" , "error" : "Could NOT perform a copy of file: '.$tmp_skfile.'"}]';
@@ -2067,16 +2067,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;
                                   }
@@ -2089,7 +2089,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