nilsteampassnet / TeamPass

sources/main.functions.php

Doc Comments +4 added lines, -1 removed lines

@@ -505,6 +505,7 @@ 
  *
  * trim a string depending on a specific string
  * @param string $element
+ * @param string $chaine
  * @return string
  */
 function trimElement($chaine, $element)
@@ -1562,6 +1563,9 @@ 
  *
  * permits to handle the Teampass config file
  * $action accepts "rebuild" and "update"
+ * @param string $action
+ * @param string $field
+ * @param integer $value
  */
 function handleConfigFile($action, $field = null, $value = null)
 {
@@ -2056,7 +2060,6 @@ 
 
 /**
  * Permits to clean and sanitize text to be displayed
- * @param  string $text text to clean
  * @param  string $type what clean to perform
  * @return string       text cleaned up
  */

Indentation +1 added lines, -1 removed lines

@@ -1414,7 +1414,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

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;

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

Spacing +2 added lines, -2 removed lines

@@ -764,7 +764,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;
             }
@@ -1329,7 +1329,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;

api/functions.php

Spacing +1 added lines, -1 removed lines

@@ -632,7 +632,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++;
                         }
                     }
                 }

sources/items.queries.php

Indentation +1 added lines, -1 removed lines

@@ -3125,7 +3125,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;
             }
 

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

includes/libraries/Authentication/DuoSecurity/Duo.php

Spacing +6 added lines, -6 removed lines

@@ -27,12 +27,12 @@ 
     private static function signVals($key, $vals, $prefix, $expire, $time = null)
     {
         $exp = ($time ? $time : time()) + $expire;
-        $val = $vals . '|' . $exp;
+        $val = $vals.'|'.$exp;
         $b64 = base64_encode($val);
-        $cookie = $prefix . '|' . $b64;
+        $cookie = $prefix.'|'.$b64;
 
         $sig = hash_hmac("sha1", $cookie, $key);
-        return $cookie . '|' . $sig;
+        return $cookie.'|'.$sig;
     }
 
     private static function parseVals($key, $val, $prefix, $ikey, $time = null)
@@ -45,7 +45,7 @@ 
         }
         list($u_prefix, $u_b64, $u_sig) = $parts;
 
-        $sig = hash_hmac("sha1", $u_prefix . '|' . $u_b64, $key);
+        $sig = hash_hmac("sha1", $u_prefix.'|'.$u_b64, $key);
         if (hash_hmac("sha1", $sig, $key) !== hash_hmac("sha1", $u_sig, $key)) {
             return null;
         }
@@ -88,12 +88,12 @@ 
             return self::ERR_AKEY;
         }
 
-        $vals = $username . '|' . $ikey;
+        $vals = $username.'|'.$ikey;
 
         $duo_sig = self::signVals($skey, $vals, self::DUO_PREFIX, self::DUO_EXPIRE, $time);
         $app_sig = self::signVals($akey, $vals, self::APP_PREFIX, self::APP_EXPIRE, $time);
 
-        return $duo_sig . ':' . $app_sig;
+        return $duo_sig.':'.$app_sig;
     }
 
     public static function verifyResponse($ikey, $skey, $akey, $sig_response, $time = null)

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" : ""}]';

admin.settings.load.php

Spacing +5 added lines, -5 removed lines

@@ -211,9 +211,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>'
                     }
@@ -221,9 +221,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>'
                     }
@@ -1019,7 +1019,7 @@ 
         function(data) {
             data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key']; ?>");
             
-            var html = '<option value="">-- <?php echo addslashes($LANG['select']);?> --</option>',
+            var html = '<option value="">-- <?php echo addslashes($LANG['select']); ?> --</option>',
                 selected = 0;
 
             for (var i=0; i<data.length; i++) {

install/upgrade_run_2.1.27.php

Spacing +1 added lines, -1 removed lines

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