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

install/upgrade_ajax.php

Spacing +1 added lines, -1 removed lines

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

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('.', '..'));

sources/main.queries.php

Indentation +1 added lines, -1 removed lines

@@ -201,7 +201,7 @@
                     logEvents('user_mngt', 'at_user_pwd_changed', $_SESSION['user_id'], $_SESSION['login'], $_SESSION['user_id']);
                     echo '[ { "error" : "none" } ]';
                 } else {
-                     echo '[ { "error" : "pwd_hash_not_correct" } ]';
+                        echo '[ { "error" : "pwd_hash_not_correct" } ]';
                 }
                 break;
 

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)

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

install/upgrade_run_final.php

Spacing +1 added lines, -1 removed lines

@@ -711,7 +711,7 @@
         utf8_encode(
             "<?php
 global \$SETTINGS;
-\$SETTINGS = array (" . $config_text . "
+\$SETTINGS = array (" . $config_text."
     );"
         )
     );

sources/items.queries.php

Spacing +1 added lines, -1 removed lines

@@ -886,7 +886,7 @@
                     /*FOLDER */
                     if ($data['id_tree'] != $dataReceived['categorie']) {
                         // Get name of folders
-                        $dataTmp = DB::query("SELECT title FROM ".prefix_table("nested_tree")." WHERE id IN %li", array($data['id_tree'],$dataReceived['categorie']));
+                        $dataTmp = DB::query("SELECT title FROM ".prefix_table("nested_tree")." WHERE id IN %li", array($data['id_tree'], $dataReceived['categorie']));
 
                         logItems($dataReceived['id'], $label, $_SESSION['user_id'], 'at_modification', $_SESSION['login'], 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title']);
                         // ask for page reloading

Indentation +22 added lines, -22 removed lines

@@ -2166,12 +2166,12 @@ 
 
             // Check that user can access this folder
             if ((
-                  in_array($post_source_folder_id, $_SESSION['groupes_visibles']) === false ||
+                    in_array($post_source_folder_id, $_SESSION['groupes_visibles']) === false ||
                   in_array($post_target_folder_id, $_SESSION['groupes_visibles']) === false) &&
                   (
-                      $post_target_folder_id === '0' &&
+                        $post_target_folder_id === '0' &&
                       isset($SETTINGS['can_create_root_folder']) === true && $SETTINGS['can_create_root_folder'] === '1'
-                  )
+                    )
             ) {
                 $returnValues = '[{"error" : "'.addslashes($LANG['error_not_allowed_to']).'"}]';
                 echo $returnValues;
@@ -3168,7 +3168,7 @@ 
             if ((isset($_SESSION['user_settings']['session_psk']) === false || empty($_SESSION['user_settings']['session_psk']) === true)
                 && ($dataSource['personal_folder'] === '1' || $dataDestination['personal_folder'] === '1')
             ) {
-                 echo '[{"error" : "ERR_PSK_REQUIRED"}]';
+                    echo '[{"error" : "ERR_PSK_REQUIRED"}]';
                 break;
             }
 
@@ -4279,19 +4279,19 @@ 
             $ret = sendEmail(
                 $LANG['email_request_access_subject'],
                 str_replace(
-                  array(
-                      '#tp_item_author#',
-                      '#tp_user#',
-                      '#tp_item#',
-                      '#tp_reason#'
-                  ),
-                  array(
-                      " ".addslashes($dataAuthor['login']),
-                      addslashes($_SESSION['login']),
-                      addslashes($dataItem['label']),
-                      nl2br(addslashes($emailText))
-                  ),
-                  $LANG['email_request_access_mail']
+                    array(
+                        '#tp_item_author#',
+                        '#tp_user#',
+                        '#tp_item#',
+                        '#tp_reason#'
+                    ),
+                    array(
+                        " ".addslashes($dataAuthor['login']),
+                        addslashes($_SESSION['login']),
+                        addslashes($dataItem['label']),
+                        nl2br(addslashes($emailText))
+                    ),
+                    $LANG['email_request_access_mail']
                 ),
                 $dataAuthor['email'],
                 $LANG,
@@ -4300,11 +4300,11 @@ 
 
             // Do log
             logItems(
-              $item_id,
-              $dataItem['label'],
-              $_SESSION['user_id'],
-              'at_access',
-              $_SESSION['login']
+                $item_id,
+                $dataItem['label'],
+                $_SESSION['user_id'],
+                'at_access',
+                $_SESSION['login']
             );
 
             // Return

install/install.queries.php

Spacing +3 added lines, -3 removed lines

@@ -227,15 +227,15 @@
                 }
                 $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `_install` WHERE `key` = 'url_path'"));
                 if (intval($tmp) === 0) {
-                    mysqli_query($dbTmp, "INSERT INTO `_install` (`key`, `value`) VALUES ('url_path', '". empty($session_url_path) ? $db['url_path'] : $session_url_path. "');");
+                    mysqli_query($dbTmp, "INSERT INTO `_install` (`key`, `value`) VALUES ('url_path', '".empty($session_url_path) ? $db['url_path'] : $session_url_path."');");
                 } else {
                     mysqli_query($dbTmp, "UPDATE `_install` SET `value` = '", empty($session_url_path) ? $db['url_path'] : $session_url_path, "' WHERE `key` = 'url_path';");
                 }
                 $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `_install` WHERE `key` = 'abspath'"));
                 if (intval($tmp) === 0) {
-                    mysqli_query($dbTmp, "INSERT INTO `_install` (`key`, `value`) VALUES ('abspath', '". empty($session_abspath) ? $db['abspath'] : $session_abspath. "');");
+                    mysqli_query($dbTmp, "INSERT INTO `_install` (`key`, `value`) VALUES ('abspath', '".empty($session_abspath) ? $db['abspath'] : $session_abspath."');");
                 } else {
-                    mysqli_query($dbTmp, "UPDATE `_install` SET `value` = '". empty($session_abspath) ? $db['abspath'] : $session_abspath. "' WHERE `key` = 'abspath';");
+                    mysqli_query($dbTmp, "UPDATE `_install` SET `value` = '".empty($session_abspath) ? $db['abspath'] : $session_abspath."' WHERE `key` = 'abspath';");
                 }
 
                 echo '[{"error" : "", "result" : "Connection is successful", "multiple" : ""}]';