nilsteampassnet / TeamPass

sources/backups.queries.php

Spacing +34 added lines, -34 removed lines

@@ -37,23 +37,23 @@ 
 }
 
 // Do checks
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'options', $SETTINGS) === false) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 header('Content-type: text/html; charset=utf-8');
 header('Cache-Control: no-cache, must-revalidate');
 require_once 'main.functions.php';
 
 // Connect to mysql server
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 DB::$host = DB_HOST;
 DB::$user = DB_USER;
 DB::$password = DB_PASSWD_CLEAR;
@@ -101,26 +101,26 @@ 
 
             // Decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_key = filter_var($dataReceived['encryptionKey'], FILTER_SANITIZE_STRING);
 
-            require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
             $return = '';
 
             //Get all tables
             $tables = array();
             $result = DB::query('SHOW TABLES');
             foreach ($result as $row) {
-                $tables[] = $row['Tables_in_' . DB_NAME];
+                $tables[] = $row['Tables_in_'.DB_NAME];
             }
 
             //cycle through
             foreach ($tables as $table) {
                 if (empty($pre) || substr_count($table, $pre) > 0) {
                     // Do query
-                    $result = DB::queryRaw('SELECT * FROM ' . $table);
+                    $result = DB::queryRaw('SELECT * FROM '.$table);
                     DB::queryRaw(
                         'SELECT *
                         FROM INFORMATION_SCHEMA.COLUMNS
@@ -132,19 +132,19 @@ 
                     $numFields = DB::count();
 
                     // prepare a drop table
-                    $return .= 'DROP TABLE ' . $table . ';';
-                    $row2 = DB::queryfirstrow('SHOW CREATE TABLE ' . $table);
-                    $return .= "\n\n" . $row2['Create Table'] . ";\n\n";
+                    $return .= 'DROP TABLE '.$table.';';
+                    $row2 = DB::queryfirstrow('SHOW CREATE TABLE '.$table);
+                    $return .= "\n\n".$row2['Create Table'].";\n\n";
 
                     //prepare all fields and datas
                     for ($i = 0; $i < $numFields; ++$i) {
                         while ($row = $result->fetch_row()) {
-                            $return .= 'INSERT INTO ' . $table . ' VALUES(';
+                            $return .= 'INSERT INTO '.$table.' VALUES(';
                             for ($j = 0; $j < $numFields; ++$j) {
                                 $row[$j] = addslashes($row[$j]);
                                 $row[$j] = preg_replace("/\n/", '\\n', $row[$j]);
                                 if (isset($row[$j])) {
-                                    $return .= '"' . $row[$j] . '"';
+                                    $return .= '"'.$row[$j].'"';
                                 } else {
                                     $return .= 'NULL';
                                 }
@@ -164,8 +164,8 @@ 
                 $token = GenerateCryptKey(20, false, true, true, false, true, $SETTINGS);
 
                 //save file
-                $filename = time() . '-' . $token . '.sql';
-                $handle = fopen($SETTINGS['path_to_files_folder'] . '/' . $filename, 'w+');
+                $filename = time().'-'.$token.'.sql';
+                $handle = fopen($SETTINGS['path_to_files_folder'].'/'.$filename, 'w+');
                 if ($handle !== false) {
                     //write file
                     fwrite($handle, $return);
@@ -177,17 +177,17 @@ 
                     // Encrypt the file
                     prepareFileWithDefuse(
                         'encrypt',
-                        $SETTINGS['path_to_files_folder'] . '/' . $filename,
-                        $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
+                        $SETTINGS['path_to_files_folder'].'/'.$filename,
+                        $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
                         $SETTINGS,
                         $post_key
                     );
 
                     // Do clean
-                    unlink($SETTINGS['path_to_files_folder'] . '/' . $filename);
+                    unlink($SETTINGS['path_to_files_folder'].'/'.$filename);
                     rename(
-                        $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
-                        $SETTINGS['path_to_files_folder'] . '/' . $filename
+                        $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
+                        $SETTINGS['path_to_files_folder'].'/'.$filename
                     );
                 }
 
@@ -208,9 +208,9 @@ 
                     array(
                         'error' => false,
                         'message' => '',
-                        'download' => 'sources/downloadFile.php?name=' . urlencode($filename) .
-                            '&sub=files&file=' . $filename . '&type=sql&key=' . $_SESSION['key'] . '&key_tmp=' .
-                            $_SESSION['key_tmp'] . '&pathIsFiles=1',
+                        'download' => 'sources/downloadFile.php?name='.urlencode($filename).
+                            '&sub=files&file='.$filename.'&type=sql&key='.$_SESSION['key'].'&key_tmp='.
+                            $_SESSION['key_tmp'].'&pathIsFiles=1',
                     ),
                     'encode'
                 );
@@ -254,18 +254,18 @@ 
 
             // Decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_key = filter_var($dataReceived['encryptionKey'], FILTER_SANITIZE_STRING);
             $post_backupFile = filter_var($dataReceived['backupFile'], FILTER_SANITIZE_STRING);
 
-            include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
             // Get filename from database
             $data = DB::queryFirstRow(
                 'SELECT valeur
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE increment_id = %i',
                 $post_backupFile
             );
@@ -284,22 +284,22 @@ 
                 // Decrypt the file
                 $ret = prepareFileWithDefuse(
                     'decrypt',
-                    $SETTINGS['path_to_files_folder'] . '/' . $post_backupFile,
-                    $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile,
+                    $SETTINGS['path_to_files_folder'].'/'.$post_backupFile,
+                    $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile,
                     $SETTINGS,
                     $post_key
                 );
 
                 if (empty($ret) === false) {
-                    echo '[{"result":"db_restore" , "message":"' . $ret . '"}]';
+                    echo '[{"result":"db_restore" , "message":"'.$ret.'"}]';
                     break;
                 }
 
                 // Do clean
-                fileDelete($SETTINGS['path_to_files_folder'] . '/' . $post_backupFile, $SETTINGS);
-                $post_backupFile = $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile;
+                fileDelete($SETTINGS['path_to_files_folder'].'/'.$post_backupFile, $SETTINGS);
+                $post_backupFile = $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile;
             } else {
-                $post_backupFile = $SETTINGS['path_to_files_folder'] . '/' . $post_backupFile;
+                $post_backupFile = $SETTINGS['path_to_files_folder'].'/'.$post_backupFile;
             }
 
             //read sql file

sources/identify.php

Spacing +89 added lines, -89 removed lines

@@ -44,23 +44,23 @@ 
     throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
 }
 
-if (! isset($SETTINGS['cpassman_dir']) || empty($SETTINGS['cpassman_dir']) === true || $SETTINGS['cpassman_dir'] === '.') {
+if (!isset($SETTINGS['cpassman_dir']) || empty($SETTINGS['cpassman_dir']) === true || $SETTINGS['cpassman_dir'] === '.') {
     $SETTINGS = [];
     $SETTINGS['cpassman_dir'] = '..';
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 
 // If Debug then clean the files
 if (DEBUGLDAP === true) {
-    define('DEBUGLDAPFILE', $SETTINGS['path_to_files_folder'] . '/ldap.debug.txt');
+    define('DEBUGLDAPFILE', $SETTINGS['path_to_files_folder'].'/ldap.debug.txt');
     $fp = fopen(DEBUGLDAPFILE, 'w');
     fclose($fp);
 }
 if (DEBUGDUO === true) {
-    define('DEBUGDUOFILE', $SETTINGS['path_to_files_folder'] . '/duo.debug.txt');
+    define('DEBUGDUOFILE', $SETTINGS['path_to_files_folder'].'/duo.debug.txt');
     $fp = fopen(DEBUGDUOFILE, 'w');
     fclose($fp);
 }
@@ -76,7 +76,7 @@ 
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -93,7 +93,7 @@ 
     // This step creates the DUO request encrypted key
 
     // load library
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/DuoSecurity/Duo.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/DuoSecurity/Duo.php';
     $sig_request = Duo::signRequest(
         $SETTINGS['IKEY'],
         $SETTINGS['SKEY'],
@@ -104,16 +104,16 @@ 
         debugIdentify(
             DEBUGDUO,
             DEBUGDUOFILE,
-            "\n\n-----\n\n" .
-                'sig request : ' . $post_login . "\n" .
-                'resp : ' . $sig_request . "\n"
+            "\n\n-----\n\n".
+                'sig request : '.$post_login."\n".
+                'resp : '.$sig_request."\n"
         );
     }
 
     // load csrfprotector
-    $csrfp_config = include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/csrfp/libs/csrfp.config.php';
+    $csrfp_config = include_once $SETTINGS['cpassman_dir'].'/includes/libraries/csrfp/libs/csrfp.config.php';
     // return result
-    echo '[{"sig_request" : "' . $sig_request . '" , "csrfp_token" : "' . $csrfp_config['CSRFP_TOKEN'] . '" , "csrfp_key" : "' . filter_var($_COOKIE[$csrfp_config['CSRFP_TOKEN']], FILTER_SANITIZE_STRING) . '"}]';
+    echo '[{"sig_request" : "'.$sig_request.'" , "csrfp_token" : "'.$csrfp_config['CSRFP_TOKEN'].'" , "csrfp_key" : "'.filter_var($_COOKIE[$csrfp_config['CSRFP_TOKEN']], FILTER_SANITIZE_STRING).'"}]';
 // ---
     // ---
 } elseif ($post_type === 'identify_duo_user_check') {
@@ -123,7 +123,7 @@ 
     //--------
 
     // load library
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/DuoSecurity/Duo.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/DuoSecurity/Duo.php';
     $authenticated_username = Duo::verifyResponse(
         $SETTINGS['duo_ikey'],
         $SETTINGS['duo_skey'],
@@ -138,7 +138,7 @@ 
             // is user in Teampass?
             DB::queryfirstrow(
                 'SELECT id
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE login = %s',
                 $post_login
             );
@@ -148,9 +148,9 @@ 
             }
         }
 
-        echo '[{"authenticated_username" : "' . $authenticated_username . '"}]';
+        echo '[{"authenticated_username" : "'.$authenticated_username.'"}]';
     } else {
-        echo '[{"authenticated_username" : "' . $authenticated_username . '"}]';
+        echo '[{"authenticated_username" : "'.$authenticated_username.'"}]';
     }
     // ---
     // ---
@@ -176,7 +176,7 @@ 
     }
 
     // Load superGlobals
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     // Prepare GET variables
     $sessionPwdAttempts = $superGlobal->get('pwd_attempts', 'SESSION');
@@ -266,19 +266,19 @@ 
     } else {
         throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
     }
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     
     header('Content-type: text/html; charset=utf-8');
     error_reporting(E_ERROR);
 
     // Load AntiXSS
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php';
     $antiXss = new voku\helper\AntiXSS();
 
     // Load superGlobals
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
     // Prepare GET variables
@@ -292,7 +292,7 @@ 
     $server['PHP_AUTH_PW'] = $superGlobal->get('PHP_AUTH_PW', 'SERVER');
 
     // connect to the server
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     DB::$host = DB_HOST;
     DB::$user = DB_USER;
     DB::$password = defined('DB_PASSWD_CLEAR') === false ? defuseReturnDecrypted(DB_PASSWD, $SETTINGS) : DB_PASSWD_CLEAR;
@@ -300,14 +300,14 @@ 
     DB::$port = DB_PORT;
     DB::$encoding = DB_ENCODING;
     // User's language loading
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $sessionUserLanguage . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$sessionUserLanguage.'.php';
     
     // decrypt and retreive data in JSON format
     if (empty($sessionKey) === true) {
         $dataReceived = $sentData;
     } else {
         $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$sentData, 'decode', $sessionKey);
+    $SETTINGS['cpassman_dir'], $sentData, 'decode', $sessionKey);
         $superGlobal->put('key', $sessionKey, 'SESSION');
     }
 
@@ -456,7 +456,7 @@ 
         // Check if any unsuccessfull login tries exist
         $rows = DB::query(
             'SELECT date
-            FROM ' . prefixTable('log_system') . "
+            FROM ' . prefixTable('log_system')."
             WHERE field_1 = %s
             AND type = 'failed_auth'
             AND label = 'password_is_not_correct'
@@ -470,7 +470,7 @@ 
             foreach ($rows as $record) {
                 array_push(
                     $arrAttempts,
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date'])
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date'])
                 );
             }
         }
@@ -585,7 +585,7 @@ 
         foreach ($superGlobal->get('user_roles', 'SESSION') as $role) {
             $resRoles = DB::queryFirstRow(
                 'SELECT title, complexity
-                FROM ' . prefixTable('roles_title') . '
+                FROM ' . prefixTable('roles_title').'
                 WHERE id=%i',
                 $role
             );
@@ -606,7 +606,7 @@ 
 
         // build complete array of roles
         $superGlobal->put('arr_roles_full', [], 'SESSION');
-        $rows = DB::query('SELECT id, title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
+        $rows = DB::query('SELECT id, title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
         foreach ($rows as $record) {
             $superGlobal->put(
                 $record['id'],
@@ -684,10 +684,10 @@ 
         $superGlobal->put('latest_items_tab', [], 'SESSION');
         $superGlobal->put('nb_roles', 0, 'SESSION');
         foreach ($superGlobal->get('latest_items', 'SESSION') as $item) {
-            if (! empty($item)) {
+            if (!empty($item)) {
                 $dataLastItems = DB::queryFirstRow(
                     'SELECT id,label,id_tree
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id=%i',
                     $item
                 );
@@ -696,7 +696,7 @@ 
                     [
                         'id' => $item,
                         'label' => $dataLastItems['label'],
-                        'url' => 'index.php?page=items&group=' . $dataLastItems['id_tree'] . '&id=' . $item,
+                        'url' => 'index.php?page=items&group='.$dataLastItems['id_tree'].'&id='.$item,
                     ],
                     'SESSION',
                     'latest_items_tab'
@@ -713,12 +713,12 @@ 
         ) {
             // get all Admin users
             $receivers = '';
-            $rows = DB::query('SELECT email FROM ' . prefixTable('users') . " WHERE admin = %i and email != ''", 1);
+            $rows = DB::query('SELECT email FROM '.prefixTable('users')." WHERE admin = %i and email != ''", 1);
             foreach ($rows as $record) {
                 if (empty($receivers)) {
                     $receivers = $record['email'];
                 } else {
-                    $receivers = ',' . $record['email'];
+                    $receivers = ','.$record['email'];
                 }
             }
             // Add email to table
@@ -734,7 +734,7 @@ 
                             '#tp_time#',
                         ],
                         [
-                            ' ' . $superGlobal->get('login', 'SESSION') . ' (IP: ' . getClientIpServer() . ')',
+                            ' '.$superGlobal->get('login', 'SESSION').' (IP: '.getClientIpServer().')',
                             date($SETTINGS['date_format'], (int) $superGlobal->get('last_connection', 'SESSION')),
                             date($SETTINGS['time_format'], (int) $superGlobal->get('last_connection', 'SESSION')),
                         ],
@@ -1059,45 +1059,45 @@ 
     }
 
     // Load expected libraries
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Illuminate/Contracts/Auth/Authenticatable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/EnumeratesValues.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/helpers.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Contracts/Support/Jsonable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Contracts/Support/Arrayable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Enumerable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Collection.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapBase.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/HandlesConnection.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Illuminate/Contracts/Auth/Authenticatable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/EnumeratesValues.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/helpers.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Contracts/Support/Jsonable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Contracts/Support/Arrayable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Enumerable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Collection.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapBase.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/HandlesConnection.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php';
     $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
     $ad->register();
     $connection = new Connection($config);
@@ -1109,7 +1109,7 @@ 
         $error = $e->getDetailedError();
         return [
             'error' => true,
-            'message' => langHdl('error').' : '.$error->getErrorCode().' - '.$error->getErrorMessage(). '<br>'.$error->getDiagnosticMessage().' '.$config['username'],
+            'message' => langHdl('error').' : '.$error->getErrorCode().' - '.$error->getErrorMessage().'<br>'.$error->getDiagnosticMessage().' '.$config['username'],
 
         ];
     }
@@ -1137,7 +1137,7 @@ 
     }
 
     // load passwordLib library
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $pwdlib->register();
     $pwdlib = new PasswordLib\PasswordLib();
     $hashedPassword = $pwdlib->createPasswordHash($passwordClear);
@@ -1196,7 +1196,7 @@ 
 function yubicoMFACheck($dataReceived, string $userInfo, array $SETTINGS): array
 {
     // Load superGlobals
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     $sessionAdmin = $superGlobal->get('user_admin', 'SESSION');
     $sessionUrl = $superGlobal->get('initial_url', 'SESSION');
@@ -1235,7 +1235,7 @@ 
     }
 
     // Now check yubico validity
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/Yubico/Yubico.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/Yubico/Yubico.php';
     $yubi = new Auth_Yubico($yubico_user_id, $yubico_user_key);
     $auth = $yubi->verify($yubico_key);
     //, null, null, null, 60
@@ -1287,7 +1287,7 @@ 
             'gestionnaire' => '0',
             'can_manage_all_users' => '0',
             'personal_folder' => $SETTINGS['enable_pf_feature'] === '1' ? '1' : '0',
-            'fonction_id' => (empty($retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass']) === false ? $retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass'] . ';' : '') . (isset($SETTINGS['ldap_new_user_role']) === true ? $SETTINGS['ldap_new_user_role'] : '0'),
+            'fonction_id' => (empty($retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass']) === false ? $retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass'].';' : '').(isset($SETTINGS['ldap_new_user_role']) === true ? $SETTINGS['ldap_new_user_role'] : '0'),
             'groupes_interdits' => '',
             'groupes_visibles' => '',
             'last_pw_change' => (int) time(),
@@ -1312,7 +1312,7 @@ 
             ]
         );
         // Rebuild tree
-        $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+        $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
         $tree->register();
         $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
         $tree->rebuild();
@@ -1343,13 +1343,13 @@ 
         && empty($dataReceived['GACode']) === false
     ) {
         // Load superGlobals
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
         $superGlobal = new protect\SuperGlobal\SuperGlobal();
         $sessionAdmin = $superGlobal->get('user_admin', 'SESSION');
         $sessionUrl = $superGlobal->get('initial_url', 'SESSION');
         $sessionPwdAttempts = $superGlobal->get('pwd_attempts', 'SESSION');
         // load library
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
         // create new instance
         $tfa = new Authentication\TwoFactorAuth\TwoFactorAuth($SETTINGS['ga_website_name']);
         // Init
@@ -1371,7 +1371,7 @@ 
             $mfaMessage = langHdl('ga_flash_qr_and_login');
             // generate new QR
             $new_2fa_qr = $tfa->getQRCodeImageAsDataUri(
-                'Teampass - ' . $username,
+                'Teampass - '.$username,
                 $userInfo['ga']
             );
             // clear temporary code from DB
@@ -1384,7 +1384,7 @@ 
                 $userInfo['id']
             );
             $firstTime = [
-                'value' => '<img src="' . $new_2fa_qr . '">',
+                'value' => '<img src="'.$new_2fa_qr.'">',
                 'user_admin' => isset($sessionAdmin) ? (int) $sessionAdmin : '',
                 'initial_url' => isset($sessionUrl) === true ? $sessionUrl : '',
                 'pwd_attempts' => (int) $sessionPwdAttempts,
@@ -1435,8 +1435,8 @@ 
     // Set to false
     $userPasswordVerified = false;
     // load passwordLib library
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $pwdlib->register();
     $pwdlib = new PasswordLib\PasswordLib();
     // Check if old encryption used
@@ -1567,7 +1567,7 @@ 
     // Brute force management
     if ($sessionPwdAttempts > 3) {
         // Load superGlobals
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
         $superGlobal = new protect\SuperGlobal\SuperGlobal();
         $superGlobal->put('next_possible_pwd_attempts', time() + 10, 'SESSION');
         $superGlobal->put('pwd_attempts', 0, 'SESSION');
@@ -1609,7 +1609,7 @@ 
     // Check if user exists
     $userInfo = DB::queryFirstRow(
         'SELECT *
-        FROM ' . prefixTable('users') . ' WHERE login=%s',
+        FROM ' . prefixTable('users').' WHERE login=%s',
         $username
     );
     

sources/ldap.queries.php

Spacing +45 added lines, -45 removed lines

@@ -45,26 +45,26 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (!checkUser($_SESSION['user_id'], $_SESSION['key'], 'ldap', $SETTINGS)) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/tp.config.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/tp.config.php';
 
 header('Content-type: text/html; charset=utf-8');
 header('Cache-Control: no-cache, no-store, must-revalidate');
 
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
 // connect to the server
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -129,39 +129,39 @@ 
         ];
 
         // Load expected libraries
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/helpers.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/HandlesConnection.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapBase.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/helpers.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/HandlesConnection.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapBase.php';
 
         $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
         $ad->register();
@@ -177,7 +177,7 @@ 
                 $SETTINGS['cpassman_dir'],
                 array(
                     'error' => true,
-                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(),
+                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(),
                 ),
                 'encode'
             );
@@ -196,7 +196,7 @@ 
                 $SETTINGS['cpassman_dir'],
                 array(
                     'error' => true,
-                    'message' => "Error : ".$e->withDetailedError($e),//->detailedError(),
+                    'message' => "Error : ".$e->withDetailedError($e), //->detailedError(),
                 ),
                 'encode'
             );
@@ -216,7 +216,7 @@ 
                 $SETTINGS['cpassman_dir'],
                 array(
                     'error' => true,
-                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(),
+                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(),
                 ),
                 'encode'
             );

sources/users.queries.php

Spacing +176 added lines, -176 removed lines

@@ -47,8 +47,8 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 $isprofileupdate = filter_input(INPUT_POST, 'isprofileupdate', FILTER_SANITIZE_STRING);
 if (
     checkUser($_SESSION['user_id'], $_SESSION['key'], 'profile', $SETTINGS) === false
@@ -59,7 +59,7 @@ 
         || $isprofileupdate === false
     ) {
         $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-        include $SETTINGS['cpassman_dir'] . '/error.php';
+        include $SETTINGS['cpassman_dir'].'/error.php';
         exit();
     } else {
         // Do special check to allow user to change attributes of his profile
@@ -68,20 +68,20 @@ 
             || checkUser($_SESSION['user_id'], $_SESSION['key'], 'profile', $SETTINGS) === false
         ) {
             $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-            include $SETTINGS['cpassman_dir'] . '/error.php';
+            include $SETTINGS['cpassman_dir'].'/error.php';
             exit();
         }
     }
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 header('Content-type: text/html; charset=utf-8');
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
 
 // Connect to mysql server
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -128,12 +128,12 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $login = filter_var($dataReceived['login'], FILTER_SANITIZE_STRING);
             $email = filter_var($dataReceived['email'], FILTER_SANITIZE_EMAIL);
-            $password = '';//filter_var($dataReceived['pw'], FILTER_SANITIZE_STRING);
+            $password = ''; //filter_var($dataReceived['pw'], FILTER_SANITIZE_STRING);
             $lastname = filter_var($dataReceived['lastname'], FILTER_SANITIZE_STRING);
             $name = filter_var($dataReceived['name'], FILTER_SANITIZE_STRING);
             $is_admin = filter_var($dataReceived['admin'], FILTER_SANITIZE_NUMBER_INT);
@@ -163,7 +163,7 @@ 
             // Check if user already exists
             $data = DB::query(
                 'SELECT id, fonction_id, groupes_interdits, groupes_visibles
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE login = %s',
                 $login
             );
@@ -379,14 +379,14 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -405,7 +405,7 @@ 
                 );
                 // delete personal folder and subfolders
                 $data = DB::queryfirstrow(
-                    'SELECT id FROM ' . prefixTable('nested_tree') . '
+                    'SELECT id FROM '.prefixTable('nested_tree').'
                     WHERE title = %s AND personal_folder = %i',
                     $post_id,
                     '1'
@@ -418,7 +418,7 @@ 
                         DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1');
                         // delete items & logs
                         $items = DB::query(
-                            'SELECT id FROM ' . prefixTable('items') . '
+                            'SELECT id FROM '.prefixTable('items').'
                             WHERE id_tree=%i AND perso = %i',
                             $folder->id,
                             '1'
@@ -470,7 +470,7 @@ 
             // Check KEY
             if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) {
                 echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
                 break;
             }
 
@@ -478,7 +478,7 @@ 
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -498,10 +498,10 @@ 
                     $post_id
                 );
                 echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => ''), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => ''), 'encode');
             } else {
                 echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode');
             }
             break;
             /*
@@ -514,7 +514,7 @@ 
                 || $_SESSION['is_admin'] !== '1'
             ) {
                 echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
                 exit();
             }
 
@@ -523,7 +523,7 @@ 
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -546,10 +546,10 @@ 
                 );
 
                 echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => ''), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => ''), 'encode');
             } else {
                 echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode');
             }
             break;
             /*
@@ -559,7 +559,7 @@ 
             // Check KEY
             if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) {
                 echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
                 break;
             }
 
@@ -569,7 +569,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
                 'SELECT admin, isAdministratedByRole, can_manage_all_users, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -594,10 +594,10 @@ 
                     $post_id
                 );
                 echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => ''), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => ''), 'encode');
             } else {
                 echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode');
             }
             break;
             /*
@@ -607,7 +607,7 @@ 
             // Check KEY
             if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) {
                 echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
                 break;
             }
 
@@ -616,7 +616,7 @@ 
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -638,10 +638,10 @@ 
                     $post_id
                 );
                 echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => ''), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => ''), 'encode');
             } else {
                 echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode');
             }
             break;
             /*
@@ -652,7 +652,7 @@ 
             // Check KEY
             if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) {
                 echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
                 break;
             }
 
@@ -662,7 +662,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
                 'SELECT admin, isAdministratedByRole, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -685,10 +685,10 @@ 
                     $post_id
                 );
                 echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => ''), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => ''), 'encode');
             } else {
                 echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode');
             }
             break;
             /*
@@ -698,7 +698,7 @@ 
             // Check KEY
             if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) {
                 echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
                 break;
             }
 
@@ -708,7 +708,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
                 'SELECT admin, isAdministratedByRole, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -728,10 +728,10 @@ 
                     $post_id
                 );
                 echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => ''), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => ''), 'encode');
             } else {
                 echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode');
             }
             break;
 
@@ -750,7 +750,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
                 'SELECT admin, isAdministratedByRole, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -789,7 +789,7 @@ 
             $return = array();
             // Check if folder exists
             $data = DB::query(
-                'SELECT * FROM ' . prefixTable('nested_tree') . '
+                'SELECT * FROM '.prefixTable('nested_tree').'
                 WHERE title = %s AND parent_id = %i',
                 filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_STRING),
                 '0'
@@ -802,7 +802,7 @@ 
             }
             // Check if role exists
             $data = DB::query(
-                'SELECT * FROM ' . prefixTable('roles_title') . '
+                'SELECT * FROM '.prefixTable('roles_title').'
                 WHERE title = %s',
                 filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_STRING)
             );
@@ -822,7 +822,7 @@ 
         case 'user_log_items':
             $nb_pages = 1;
             $logs = $sql_filter = '';
-            $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>' . langHdl('pages') . '&nbsp;:&nbsp;</td>';
+            $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>'.langHdl('pages').'&nbsp;:&nbsp;</td>';
 
             // Prepare POST variables
             $post_nb_items_by_page = filter_input(INPUT_POST, 'nb_items_by_page', FILTER_SANITIZE_NUMBER_INT);
@@ -834,14 +834,14 @@ 
                     && !empty(filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING))
                     && filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING) !== 'all'
                 ) {
-                    $sql_filter = " AND l.action = '" . filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING) . "'";
+                    $sql_filter = " AND l.action = '".filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING)."'";
                 }
                 // get number of pages
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('log_items') . ' as l
-                    INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id)
-                    INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
+                    FROM ' . prefixTable('log_items').' as l
+                    INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id)
+                    INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
                     WHERE l.id_user = %i ' . $sql_filter,
                     filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT)
                 );
@@ -859,19 +859,19 @@ 
                 // launch query
                 $rows = DB::query(
                     'SELECT l.date as date, u.login as login, i.label as label, l.action as action
-                    FROM ' . prefixTable('log_items') . ' as l
-                    INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id)
-                    INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
-                    WHERE l.id_user = %i ' . $sql_filter . '
+                    FROM ' . prefixTable('log_items').' as l
+                    INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id)
+                    INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
+                    WHERE l.id_user = %i ' . $sql_filter.'
                     ORDER BY date DESC
-                    LIMIT ' . intval($start) . ',' . intval($post_nb_items_by_page),
+                    LIMIT ' . intval($start).','.intval($post_nb_items_by_page),
                     filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT)
                 );
             } else {
                 // get number of pages
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('log_system') . '
+                    FROM ' . prefixTable('log_system').'
                     WHERE type = %s AND field_1=%i',
                     'user_mngt',
                     filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT)
@@ -890,7 +890,7 @@ 
                 // launch query
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('log_system') . '
+                    FROM ' . prefixTable('log_system').'
                     WHERE type = %s AND field_1 = %i
                     ORDER BY date DESC
                     LIMIT %i, %i',
@@ -904,7 +904,7 @@ 
             if (isset($counter) && $counter != 0) {
                 $nb_pages = ceil($counter / intval($post_nb_items_by_page));
                 for ($i = 1; $i <= $nb_pages; ++$i) {
-                    $pages .= '<td onclick=\'displayLogs(' . $i . ',\"' . $post_scope . '\")\'><span style=\'cursor:pointer;' . (filter_input(INPUT_POST, 'page', FILTER_SANITIZE_NUMBER_INT) === $i ? 'font-weight:bold;font-size:18px;\'>' . $i : '\'>' . $i) . '</span></td>';
+                    $pages .= '<td onclick=\'displayLogs('.$i.',\"'.$post_scope.'\")\'><span style=\'cursor:pointer;'.(filter_input(INPUT_POST, 'page', FILTER_SANITIZE_NUMBER_INT) === $i ? 'font-weight:bold;font-size:18px;\'>'.$i : '\'>'.$i).'</span></td>';
                 }
             }
             $pages .= '</tr></table>';
@@ -913,7 +913,7 @@ 
                     if ($post_scope === 'user_mngt') {
                         $user = DB::queryfirstrow(
                             'SELECT login
-                            from ' . prefixTable('users') . '
+                            from ' . prefixTable('users').'
                             WHERE id=%i',
                             $record['qui']
                         );
@@ -923,7 +923,7 @@ 
                         if ($tmp[0] == 'at_user_initial_pwd_changed') {
                             $label = langHdl('log_user_initial_pwd_changed');
                         } elseif ($tmp[0] == 'at_user_email_changed') {
-                            $label = langHdl('log_user_email_changed') . $tmp[1];
+                            $label = langHdl('log_user_email_changed').$tmp[1];
                         } elseif ($tmp[0] == 'at_user_added') {
                             $label = langHdl('log_user_created');
                         } elseif ($tmp[0] == 'at_user_locked') {
@@ -934,14 +934,14 @@ 
                             $label = langHdl('log_user_pwd_changed');
                         }
                         // prepare log
-                        $logs .= '<tr><td>' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . '</td><td align=\"center\">' . $label . '</td><td align=\"center\">' . $user['login'] . '</td><td align=\"center\"></td></tr>';
+                        $logs .= '<tr><td>'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).'</td><td align=\"center\">'.$label.'</td><td align=\"center\">'.$user['login'].'</td><td align=\"center\"></td></tr>';
                     } else {
-                        $logs .= '<tr><td>' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . '</td><td align=\"center\">' . str_replace('"', '\"', $record['label']) . '</td><td align=\"center\">' . $record['login'] . '</td><td align=\"center\">' . langHdl($record['action']) . '</td></tr>';
+                        $logs .= '<tr><td>'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).'</td><td align=\"center\">'.str_replace('"', '\"', $record['label']).'</td><td align=\"center\">'.$record['login'].'</td><td align=\"center\">'.langHdl($record['action']).'</td></tr>';
                     }
                 }
             }
 
-            echo '[ { "table_logs": "' . ($logs) . '", "pages": "' . ($pages) . '", "error" : "no" } ]';
+            echo '[ { "table_logs": "'.($logs).'", "pages": "'.($pages).'", "error" : "no" } ]';
             break;
 
             /*
@@ -967,7 +967,7 @@ 
             } else {
                 // Get folder id for Admin
                 $admin_folder = DB::queryFirstRow(
-                    'SELECT id FROM ' . prefixTable('nested_tree') . '
+                    'SELECT id FROM '.prefixTable('nested_tree').'
                     WHERE title = %i AND personal_folder = %i',
                     intval($_SESSION['user_id']),
                     '1'
@@ -978,15 +978,15 @@ 
                     // Get each Items in PF
                     $rows = DB::query(
                         'SELECT i.pw, i.label, l.id_user
-                        FROM ' . prefixTable('items') . ' as i
-                        LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item=i.id)
+                        FROM ' . prefixTable('items').' as i
+                        LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item=i.id)
                         WHERE l.action = %s AND i.perso=%i AND i.id_tree=%i',
                         'at_creation',
                         '1',
                         intval($folder->id)
                     );
                     foreach ($rows as $record) {
-                        echo $record['label'] . ' - ';
+                        echo $record['label'].' - ';
                         // Change user
                         DB::update(
                             prefixTable('log_items'),
@@ -1021,7 +1021,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
                 'SELECT admin, isAdministratedByRole, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_user_id
             );
@@ -1058,7 +1058,7 @@ 
 
             // Do
             $rows = DB::query(
-                'SELECT id FROM ' . prefixTable('users') . '
+                'SELECT id FROM '.prefixTable('users').'
                 WHERE timestamp != %s AND admin != %i',
                 '',
                 '1'
@@ -1067,7 +1067,7 @@ 
                 // Get info about user to delete
                 $data_user = DB::queryfirstrow(
                     'SELECT admin, isAdministratedByRole, gestionnaire
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $record['id']
                 );
@@ -1120,7 +1120,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
             
             // Prepare variables
             $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
@@ -1128,7 +1128,7 @@ 
             // Get info about user
             $rowUser = DB::queryfirstrow(
                 'SELECT *
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -1146,7 +1146,7 @@ 
                 $arrFldAllowed = array();
 
                 //Build tree
-                $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+                $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
                 $tree->register();
                 $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
 
@@ -1157,7 +1157,7 @@ 
                 // array of roles for actual user
                 $my_functions = explode(';', $_SESSION['fonction_id']);
 
-                $rows = DB::query('SELECT id,title,creator_id FROM ' . prefixTable('roles_title'));
+                $rows = DB::query('SELECT id,title,creator_id FROM '.prefixTable('roles_title'));
                 foreach ($rows as $record) {
                     if (
                         (int) $_SESSION['is_admin'] === 1
@@ -1193,7 +1193,7 @@ 
                 $rolesList = array();
                 $managedBy = array();
                 $selected = '';
-                $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
+                $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
                 foreach ($rows as $reccord) {
                     $rolesList[$reccord['id']] = array('id' => $reccord['id'], 'title' => $reccord['title']);
                 }
@@ -1224,7 +1224,7 @@ 
                         array_push(
                             $managedBy,
                             array(
-                                'title' => langHdl('managers_of') . ' ' . $fonction['title'],
+                                'title' => langHdl('managers_of').' '.$fonction['title'],
                                 'id' => $fonction['id'],
                                 'selected' => $selected,
                             )
@@ -1306,9 +1306,9 @@ 
 
                 // get USER STATUS
                 if ($rowUser['disabled'] == 1) {
-                    $arrData['info'] = langHdl('user_info_locked') . '<br><input type="checkbox" value="unlock" name="1" class="chk">&nbsp;<label for="1">' . langHdl('user_info_unlock_question') . '</label><br><input type="checkbox"  value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">' . langHdl('user_info_delete_question') . '</label>';
+                    $arrData['info'] = langHdl('user_info_locked').'<br><input type="checkbox" value="unlock" name="1" class="chk">&nbsp;<label for="1">'.langHdl('user_info_unlock_question').'</label><br><input type="checkbox"  value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">'.langHdl('user_info_delete_question').'</label>';
                 } else {
-                    $arrData['info'] = langHdl('user_info_active') . '<br><input type="checkbox" value="lock" class="chk">&nbsp;' . langHdl('user_info_lock_question');
+                    $arrData['info'] = langHdl('user_info_active').'<br><input type="checkbox" value="lock" class="chk">&nbsp;'.langHdl('user_info_lock_question');
                 }
 
                 $arrData['error'] = false;
@@ -1380,7 +1380,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_STRING);
@@ -1405,7 +1405,7 @@ 
                 // count number of admins
                 $users = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE admin = 1 AND email != "" AND pw != ""'
                 );
                 if (DB::count() === 1) {
@@ -1494,7 +1494,7 @@ 
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -1515,7 +1515,7 @@ 
                     );
                     // delete personal folder and subfolders
                     $data = DB::queryfirstrow(
-                        'SELECT id FROM ' . prefixTable('nested_tree') . '
+                        'SELECT id FROM '.prefixTable('nested_tree').'
                         WHERE title = %s AND personal_folder = %i',
                         $post_id,
                         '1'
@@ -1528,7 +1528,7 @@ 
                             DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1');
                             // delete items & logs
                             $items = DB::query(
-                                'SELECT id FROM ' . prefixTable('items') . '
+                                'SELECT id FROM '.prefixTable('items').'
                                 WHERE id_tree=%i AND perso = %i',
                                 $folder->id,
                                 '1'
@@ -1549,7 +1549,7 @@ 
                 } else {
                     // Get old data about user
                     $oldData = DB::queryfirstrow(
-                        'SELECT * FROM ' . prefixTable('users') . '
+                        'SELECT * FROM '.prefixTable('users').'
                         WHERE id = %i',
                         $post_id
                     );
@@ -1579,7 +1579,7 @@ 
 
                     // update LOG
                     if ($oldData['email'] !== $post_email) {
-                        logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:' . $oldData['email'], (string) $_SESSION['user_id'], $_SESSION['login'], $post_id);
+                        logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:'.$oldData['email'], (string) $_SESSION['user_id'], $_SESSION['login'], $post_id);
                     }
                 }
                 echo prepareExchangedData(
@@ -1632,14 +1632,14 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -1691,7 +1691,7 @@ 
             }
 
             DB::queryfirstrow(
-                'SELECT * FROM ' . prefixTable('users') . '
+                'SELECT * FROM '.prefixTable('users').'
                 WHERE login = %s',
                 filter_input(INPUT_POST, 'login', FILTER_SANITIZE_STRING)
             );
@@ -1736,7 +1736,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_id = filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT);
@@ -1744,14 +1744,14 @@ 
             $arrData = array();
 
             //Build tree
-            $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+            $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
             $tree->register();
             $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
 
             // get User info
             $rowUser = DB::queryFirstRow(
                 'SELECT login, name, lastname, email, disabled, fonction_id, groupes_interdits, groupes_visibles, isAdministratedByRole, avatar_thumb
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -1769,7 +1769,7 @@ 
                 // refine folders based upon roles
                 $rows = DB::query(
                     'SELECT folder_id, type
-                    FROM ' . prefixTable('roles_values') . '
+                    FROM ' . prefixTable('roles_values').'
                     WHERE role_id IN %ls
                     ORDER BY folder_id ASC',
                     $arrData['functions']
@@ -1792,7 +1792,7 @@ 
                 }
 
                 // add allowed folders
-                foreach($arrData['allowed_folders'] as $Fld) {
+                foreach ($arrData['allowed_folders'] as $Fld) {
                     array_push($arrFolders, array('id' => $Fld, 'type' => 'W', 'special' => true));
                 }
 
@@ -1803,7 +1803,7 @@ 
                             // get folder name
                             $row = DB::queryFirstRow(
                                 'SELECT title, nlevel, id
-                                FROM ' . prefixTable('nested_tree') . '
+                                FROM ' . prefixTable('nested_tree').'
                                 WHERE id = %i',
                                 $fld['id']
                             );
@@ -1816,36 +1816,36 @@ 
 
                             // manage right icon
                             if ($fld['type'] == 'W') {
-                                $label = '<i class="fas fa-indent infotip text-success mr-2" title="' . langHdl('write') . '"></i>' .
-                                    '<i class="fas fa-edit infotip text-success mr-2" title="' . langHdl('edit') . '"></i>' .
-                                    '<i class="fas fa-eraser infotip text-success" title="' . langHdl('delete') . '"></i>';
+                                $label = '<i class="fas fa-indent infotip text-success mr-2" title="'.langHdl('write').'"></i>'.
+                                    '<i class="fas fa-edit infotip text-success mr-2" title="'.langHdl('edit').'"></i>'.
+                                    '<i class="fas fa-eraser infotip text-success" title="'.langHdl('delete').'"></i>';
                             } elseif ($fld['type'] == 'ND') {
-                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' .
-                                    '<i class="fas fa-edit infotip text-success mr-2" title="' . langHdl('edit') . '"></i>' .
-                                    '<i class="fas fa-eraser infotip text-danger" title="' . langHdl('no_delete') . '"></i>';
+                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'.
+                                    '<i class="fas fa-edit infotip text-success mr-2" title="'.langHdl('edit').'"></i>'.
+                                    '<i class="fas fa-eraser infotip text-danger" title="'.langHdl('no_delete').'"></i>';
                             } elseif ($fld['type'] == 'NE') {
-                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' .
-                                    '<i class="fas fa-edit infotip text-danger mr-2" title="' . langHdl('no_edit') . '"></i>' .
-                                    '<i class="fas fa-eraser infotip text-success" title="' . langHdl('delete') . '"></i>';
+                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'.
+                                    '<i class="fas fa-edit infotip text-danger mr-2" title="'.langHdl('no_edit').'"></i>'.
+                                    '<i class="fas fa-eraser infotip text-success" title="'.langHdl('delete').'"></i>';
                             } elseif ($fld['type'] == 'NDNE') {
-                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' .
-                                    '<i class="fas fa-edit infotip text-danger mr-2" title="' . langHdl('no_edit') . '"></i>' .
-                                    '<i class="fas fa-eraser infotip text-danger" title="' . langHdl('no_delete') . '"></i>';
+                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'.
+                                    '<i class="fas fa-edit infotip text-danger mr-2" title="'.langHdl('no_edit').'"></i>'.
+                                    '<i class="fas fa-eraser infotip text-danger" title="'.langHdl('no_delete').'"></i>';
                             } else {
-                                $label = '<i class="fas fa-eye infotip text-info mr-2" title="' . langHdl('read') . '"></i>';
+                                $label = '<i class="fas fa-eye infotip text-info mr-2" title="'.langHdl('read').'"></i>';
                             }
 
-                            $html .= '<tr><td>' . $ident . $row['title'] .
-                                ' <small class="text-info">[' . $row['id'] . ']</small>'.
-                                ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="' . langHdl('user_specific_right') . '"></i>' : '').
-                                '</td><td>' . $label . '</td></tr>';
+                            $html .= '<tr><td>'.$ident.$row['title'].
+                                ' <small class="text-info">['.$row['id'].']</small>'.
+                                ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="'.langHdl('user_specific_right').'"></i>' : '').
+                                '</td><td>'.$label.'</td></tr>';
                             break;
                         }
                     }
                 }
 
-                $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>' .
-                    $html . '</tbody></table>';
+                $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>'.
+                    $html.'</tbody></table>';
             } else {
                 $html_full = '';
             }
@@ -1894,7 +1894,7 @@ 
             if ((int) $_SESSION['is_admin'] === 0 && (int) $_SESSION['user_can_manage_all_users'] === 0) {
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE admin = %i AND isAdministratedByRole IN %ls',
                     '0',
                     array_filter($_SESSION['user_roles'])
@@ -1902,7 +1902,7 @@ 
             } else {
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE admin = %i',
                     '0'
                 );
@@ -1914,7 +1914,7 @@ 
                 $groupIds = [];
                 foreach (explode(';', $record['fonction_id']) as $group) {
                     $tmp = DB::queryfirstrow(
-                        'SELECT id, title FROM ' . prefixTable('roles_title') . '
+                        'SELECT id, title FROM '.prefixTable('roles_title').'
                         WHERE id = %i',
                         $group
                     );
@@ -1926,7 +1926,7 @@ 
 
                 // Get managed_by
                 $managedBy = DB::queryfirstrow(
-                    'SELECT id, title FROM ' . prefixTable('roles_title') . '
+                    'SELECT id, title FROM '.prefixTable('roles_title').'
                     WHERE id = %i',
                     $record['isAdministratedByRole']
                 );
@@ -1936,7 +1936,7 @@ 
                 $foldersAllowedIds = [];
                 foreach (explode(';', $record['groupes_visibles']) as $role) {
                     $tmp = DB::queryfirstrow(
-                        'SELECT id, title FROM ' . prefixTable('nested_tree') . '
+                        'SELECT id, title FROM '.prefixTable('nested_tree').'
                         WHERE id = %i',
                         $role
                     );
@@ -1949,7 +1949,7 @@ 
                 $foldersForbiddenIds = [];
                 foreach (explode(';', $record['groupes_interdits']) as $role) {
                     $tmp = DB::queryfirstrow(
-                        'SELECT id, title FROM ' . prefixTable('nested_tree') . '
+                        'SELECT id, title FROM '.prefixTable('nested_tree').'
                         WHERE id = %i',
                         $role
                     );
@@ -1967,7 +1967,7 @@ 
                         'login' => $record['login'],
                         'groups' => implode(', ', $groups),
                         'groupIds' => $groupIds,
-                        'managedBy' => $managedBy=== null ? langHdl('administrator') : $managedBy['title'],
+                        'managedBy' => $managedBy === null ? langHdl('administrator') : $managedBy['title'],
                         'managedById' => $managedBy === null ? 0 : $managedBy['id'],
                         'foldersAllowed' => implode(', ', $foldersAllowed),
                         'foldersAllowedIds' => $foldersAllowedIds,
@@ -2023,7 +2023,7 @@ 
 
             // decrypt and retreive data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             $post_source_id = filter_var(htmlspecialchars_decode($dataReceived['source_id']), FILTER_SANITIZE_NUMBER_INT);
             $post_destination_ids = filter_var_array($dataReceived['destination_ids'], FILTER_SANITIZE_NUMBER_INT);
@@ -2049,7 +2049,7 @@ 
 
             // Get info about user
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_source_id
             );
@@ -2205,7 +2205,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // prepare variables
             $post_user_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
@@ -2217,14 +2217,14 @@ 
             if (empty($post_context) === false && $post_context === 'add_one_role_to_user') {
                 $data_user = DB::queryfirstrow(
                     'SELECT fonction_id
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_user_id
                 );
 
                 if ($data_user) {
                     // Ensure array is unique
-                    $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value;
+                    $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value;
                     $post_new_value = implode(';', array_unique(explode(';', $post_new_value)));
                 } else {
                     // User not found
@@ -2282,7 +2282,7 @@ 
             if (filter_input(INPUT_POST, 'step', FILTER_SANITIZE_STRING) === 'refresh') {
                 $record = DB::queryFirstRow(
                     'SELECT user_ip_lastdate
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $_SESSION['user_id']
                 );
@@ -2378,39 +2378,39 @@ 
             ];
 
             // Load expected libraries
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapBase.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/HandlesConnection.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapBase.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/HandlesConnection.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php';
 
             $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
             $ad->register();
@@ -2427,7 +2427,7 @@ 
     $SETTINGS['cpassman_dir'],
                     array(
                         'error' => true,
-                        'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(),
+                        'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(),
                     ),
                     'encode'
                 );
@@ -2458,12 +2458,12 @@ 
                 ['objectclass', '=', 'posixaccount'],
             ], null, null, 'or')->get();
             
-            foreach($users as $i => $adUser) {
+            foreach ($users as $i => $adUser) {
                 if (isset($adUser[$SETTINGS['ldap_user_attribute']]) === false) continue;
                 
                 // Build the list of all groups in AD
                 if (isset($adUser['memberof']) === true) {
-                    foreach($adUser['memberof'] as $j => $adUserGroup) {
+                    foreach ($adUser['memberof'] as $j => $adUserGroup) {
                         if (empty($adUserGroup) === false && $j !== "count") {
                             $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3);
                             if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) {
@@ -2479,7 +2479,7 @@ 
                     // Get his ID
                     DB::queryfirstrow(
                         'SELECT id, fonction_id, auth_type
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE login = %s',
                         $userLogin
                     );
@@ -2514,7 +2514,7 @@ 
             }
 
             // Get all groups in Teampass
-            $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title'));
+            $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title'));
             foreach ($rows as $record) {
                 array_push(
                     $teampassRoles,
@@ -2557,7 +2557,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_login = filter_var($dataReceived['login'], FILTER_SANITIZE_STRING);
@@ -2584,7 +2584,7 @@ 
             // Check if user already exists
             $data = DB::query(
                 'SELECT id, fonction_id, groupes_interdits, groupes_visibles
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE login = %s',
                 $post_login
             );
@@ -2691,7 +2691,7 @@ 
                 );
 
                 // Rebuild tree
-                $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+                $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
                 $tree->register();
                 $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
                 $tree->rebuild();
@@ -2743,7 +2743,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT);
@@ -2765,7 +2765,7 @@ 
             // Check if user already exists
             DB::query(
                 'SELECT id
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -2822,7 +2822,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_userid = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
@@ -2846,7 +2846,7 @@ 
             // Check if user already exists
             $userInfo = DB::queryfirstrow(
                 'SELECT id, private_key, public_key
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_userid
             );
@@ -2895,7 +2895,7 @@ 
             if (count($_SESSION['personal_folders']) > 0) {
                 DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id_tree IN %ls',
                     $_SESSION['personal_folders']
                 );
@@ -2955,7 +2955,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
@@ -2977,7 +2977,7 @@ 
             // Check if user already exists
             DB::query(
                 'SELECT id
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -3044,7 +3044,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_user_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
@@ -3075,7 +3075,7 @@ 
 
     // Get info about user
     $data_user = DB::queryfirstrow(
-        'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+        'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
         WHERE id = %i',
         $value[1]
     );
@@ -3108,7 +3108,7 @@ 
             logEvents(
                 $SETTINGS,
                 'user_mngt',
-                'at_user_new_' . $value[0] . ':' . $value[1],
+                'at_user_new_'.$value[0].':'.$value[1],
                 (string) $_SESSION['user_id'],
                 $_SESSION['login'],
                 filter_input(INPUT_POST, 'id', FILTER_SANITIZE_STRING)
@@ -3140,7 +3140,7 @@ 
 
     // Get info about user
     $data_user = DB::queryfirstrow(
-        'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+        'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
         WHERE id = %i',
         $value[1]
     );

sources/find.queries.php

Spacing +47 added lines, -47 removed lines

@@ -28,7 +28,7 @@ 
 require_once 'SecureHandler.php';
 session_name('teampass_session');
 session_start();
-if (! isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || ! isset($_SESSION['key']) || empty($_SESSION['key'])) {
+if (!isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || !isset($_SESSION['key']) || empty($_SESSION['key'])) {
     die('Hacking attempt...');
 }
 
@@ -42,17 +42,17 @@ 
 }
 
 // Do checks
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'items', $SETTINGS) === false) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 header('Content-type: text/html; charset=utf-8');
 header('Cache-Control: no-cache, must-revalidate');
 require_once 'main.functions.php';
@@ -60,12 +60,12 @@ 
 if (isset($_SESSION['groupes_visibles']) === false
     || empty($_SESSION['groupes_visibles']) === true
 ) {
-    echo '{"sEcho": ' . intval($_GET['sEcho']) . ' ,"iTotalRecords": "0", "iTotalDisplayRecords": "0", "aaData": [] }';
+    echo '{"sEcho": '.intval($_GET['sEcho']).' ,"iTotalRecords": "0", "iTotalDisplayRecords": "0", "aaData": [] }';
     exit;
 }
 
 //Connect to DB
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -89,7 +89,7 @@ 
     $folders = $_SESSION['groupes_visibles'];
 } else {
     // Build tree
-    $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $tree->register();
     $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
     $folders = $tree->getDescendants(filter_var($_GET['limited'], FILTER_SANITIZE_NUMBER_INT), true);
@@ -98,7 +98,7 @@ 
 
 //Get current user "personal folder" ID
 $row = DB::query(
-    'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE title = %i',
+    'SELECT id FROM '.prefixTable('nested_tree').' WHERE title = %i',
     intval($_SESSION['user_id'])
 );
 //get list of personal folders
@@ -107,20 +107,20 @@ 
 $listPf = '';
 if (empty($row['id']) === false) {
     $rows = DB::query(
-        'SELECT id FROM ' . prefixTable('nested_tree') . '
+        'SELECT id FROM '.prefixTable('nested_tree').'
         WHERE personal_folder = 1 AND NOT parent_id = %i AND NOT title = %i',
         filter_var($row['id'], FILTER_SANITIZE_NUMBER_INT),
         filter_var($_SESSION['user_id'], FILTER_SANITIZE_NUMBER_INT)
     );
     foreach ($rows as $record) {
-        if (! in_array($record['id'], $arrayPf)) {
+        if (!in_array($record['id'], $arrayPf)) {
             //build an array of personal folders ids
             array_push($arrayPf, $record['id']);
             //build also a string with those ids
             if (empty($listPf)) {
                 $listPf = $record['id'];
             } else {
-                $listPf .= ', ' . $record['id'];
+                $listPf .= ', '.$record['id'];
             }
         }
     }
@@ -130,7 +130,7 @@ 
 //Paging
 $sLimit = '';
 if (isset($_GET['start']) === true && $_GET['length'] !== '-1') {
-    $sLimit = 'LIMIT ' . filter_var($_GET['start'], FILTER_SANITIZE_NUMBER_INT) . ', ' . filter_var($_GET['length'], FILTER_SANITIZE_NUMBER_INT) . '';
+    $sLimit = 'LIMIT '.filter_var($_GET['start'], FILTER_SANITIZE_NUMBER_INT).', '.filter_var($_GET['length'], FILTER_SANITIZE_NUMBER_INT).'';
 }
 
 //Ordering
@@ -143,8 +143,8 @@ 
     }
     $sOrder = 'ORDER BY  ';
     if ($_GET['order'][0]['column'] >= 0) {
-        $sOrder .= '' . $aColumns[filter_var($_GET['order'][0]['column'], FILTER_SANITIZE_NUMBER_INT)] . ' '
-                . filter_var($_GET['order'][0]['dir'], FILTER_SANITIZE_STRING) . ', ';
+        $sOrder .= ''.$aColumns[filter_var($_GET['order'][0]['column'], FILTER_SANITIZE_NUMBER_INT)].' '
+                . filter_var($_GET['order'][0]['dir'], FILTER_SANITIZE_STRING).', ';
     }
 
     $sOrder = substr_replace($sOrder, '', -2);
@@ -152,7 +152,7 @@ 
         $sOrder = '';
     }
 } else {
-    $sOrder = 'ORDER BY ' . $aColumns[1] . ' ASC';
+    $sOrder = 'ORDER BY '.$aColumns[1].' ASC';
 }
 
 // Define criteria
@@ -174,9 +174,9 @@ 
 if (empty($search_criteria) === false) {
     $sWhere .= ' AND (';
     for ($i = 0; $i < count($aColumns); ++$i) {
-        $sWhere .= $aColumns[$i] . ' LIKE %ss_' . $i . ' OR ';
+        $sWhere .= $aColumns[$i].' LIKE %ss_'.$i.' OR ';
     }
-    $sWhere = substr_replace((string) $sWhere, '', -3) . ') ';
+    $sWhere = substr_replace((string) $sWhere, '', -3).') ';
     $crit = [
         'idtree' => array_unique($folders),
         '0' => $search_criteria,
@@ -214,13 +214,13 @@ 
     if (empty($sWhere) === false) {
         $sWhere .= ' AND ';
     }
-    $sWhere = 'WHERE ' . $sWhere . 'id_tree NOT IN %ls_pf ';
+    $sWhere = 'WHERE '.$sWhere.'id_tree NOT IN %ls_pf ';
 } else {
-    $sWhere = 'WHERE ' . $sWhere;
+    $sWhere = 'WHERE '.$sWhere;
 }
 
 DB::query(
-    'SELECT id FROM ' . prefixTable('cache') . "
+    'SELECT id FROM '.prefixTable('cache')."
     ${sWhere}
     ${sOrder}",
     $crit
@@ -228,7 +228,7 @@ 
 $iTotal = DB::count();
 $rows = DB::query(
     'SELECT id, label, description, tags, id_tree, perso, restricted_to, login, folder, author, renewal_period, url, timestamp
-    FROM ' . prefixTable('cache') . "
+    FROM ' . prefixTable('cache')."
     ${sWhere}
     ${sOrder}
     ${sLimit}",
@@ -241,7 +241,7 @@ 
 if (isset($_GET['type']) === false) {
     $sOutput = '{';
     if (isset($_GET['draw']) === true) {
-        $sOutput .= '"draw": ' . intval($_GET['draw']) . ', ';
+        $sOutput .= '"draw": '.intval($_GET['draw']).', ';
     }
     $sOutput .= '"data": [';
     $sOutputConst = '';
@@ -258,7 +258,7 @@ 
             foreach (explode(';', $_SESSION['fonction_id']) as $role) {
                 //db::debugmode(true);
                 $access = DB::queryFirstRow(
-                    'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i',
+                    'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i',
                     $role,
                     $record['id_tree']
                 );
@@ -278,7 +278,7 @@ 
             }
             $accessLevel = count($arrTmp) > 0 ? min($arrTmp) : $accessLevel;
             if ($accessLevel === 0) {
-                $checkbox = '<input type=\"checkbox\" value=\"0\" class=\"mass_op_cb\" data-id=\"' . $record['id'] . '\">';
+                $checkbox = '<input type=\"checkbox\" value=\"0\" class=\"mass_op_cb\" data-id=\"'.$record['id'].'\">';
             }
 
             if ((int) $accessLevel === 0) {
@@ -318,22 +318,22 @@ 
             if (empty($restrictedTo)) {
                 $restrictedTo = $_SESSION['user_id'];
             } else {
-                $restrictedTo .= ',' . $_SESSION['user_id'];
+                $restrictedTo .= ','.$_SESSION['user_id'];
             }
         }
 
         //col1
-        $sOutputItem .= '"<i class=\"fa fa-external-link-alt infotip mr-2\" title=\"' . langHdl('open_url_link') . '\" onClick=\"window.location.href=&#039;index.php?page=items&amp;group=' . $record['id_tree'] . '&amp;id=' . $record['id'] . '&#039;\" style=\"cursor:pointer;\"></i>' .
-            '<i class=\"fa fa-eye infotip mr-2 item-detail\" title=\"' . langHdl('see_item_title') . '\" data-id=\"' . $record['id'] . '\" data-perso=\"' . $record['perso'] . '\" data-tree-id=\"' . $record['id_tree'] . '\" data-expired=\"' . $expired . '\" data-restricted-to=\"' . $restrictedTo . '\" data-rights=\"' . $right . '\" style=\"cursor:pointer;\"></i>' . $checkbox . '", ';
+        $sOutputItem .= '"<i class=\"fa fa-external-link-alt infotip mr-2\" title=\"'.langHdl('open_url_link').'\" onClick=\"window.location.href=&#039;index.php?page=items&amp;group='.$record['id_tree'].'&amp;id='.$record['id'].'&#039;\" style=\"cursor:pointer;\"></i>'.
+            '<i class=\"fa fa-eye infotip mr-2 item-detail\" title=\"'.langHdl('see_item_title').'\" data-id=\"'.$record['id'].'\" data-perso=\"'.$record['perso'].'\" data-tree-id=\"'.$record['id_tree'].'\" data-expired=\"'.$expired.'\" data-restricted-to=\"'.$restrictedTo.'\" data-rights=\"'.$right.'\" style=\"cursor:pointer;\"></i>'.$checkbox.'", ';
         //col2
-        $sOutputItem .= '"<span id=\"item_label-' . $record['id'] . '\">' . stripslashes($record['label']) . '</span>", ';
+        $sOutputItem .= '"<span id=\"item_label-'.$record['id'].'\">'.stripslashes($record['label']).'</span>", ';
         //col3
-        $sOutputItem .= '"' . str_replace('&amp;', '&', htmlspecialchars(stripslashes($record['login']), ENT_QUOTES)) . '", ';
+        $sOutputItem .= '"'.str_replace('&amp;', '&', htmlspecialchars(stripslashes($record['login']), ENT_QUOTES)).'", ';
         //col4
         //get restriction from ROles
         $restrictedToRole = false;
         $rTmp = DB::queryFirstColumn(
-            'SELECT role_id FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i',
+            'SELECT role_id FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i',
             $record['id']
         );
         // We considere here that if user has at least one group similar to the object ones
@@ -351,14 +351,14 @@ 
         } else {
             $txt = str_replace(['\n', '<br />', '\\'], [' ', ' ', '', ' '], strip_tags($record['description']));
             if (strlen($txt) > 50) {
-                $sOutputItem .= '"' . substr(stripslashes(preg_replace('~/<[\/]{0,1}[^>]*>\//|[ \t]/~', '', $txt)), 0, 50) . '", ';
+                $sOutputItem .= '"'.substr(stripslashes(preg_replace('~/<[\/]{0,1}[^>]*>\//|[ \t]/~', '', $txt)), 0, 50).'", ';
             } else {
-                $sOutputItem .= '"' . stripslashes(preg_replace('~/<[^>]*>|[ \t]/~', '', $txt)) . '", ';
+                $sOutputItem .= '"'.stripslashes(preg_replace('~/<[^>]*>|[ \t]/~', '', $txt)).'", ';
             }
         }
 
         //col5 - TAGS
-        $sOutputItem .= '"' . htmlspecialchars(stripslashes($record['tags']), ENT_QUOTES) . '", ';
+        $sOutputItem .= '"'.htmlspecialchars(stripslashes($record['tags']), ENT_QUOTES).'", ';
         // col6 - URL
         if ($record['url'] !== '0') {
             $sOutputItem .= '"'.filter_var($record['url'], FILTER_SANITIZE_URL).'", ';
@@ -367,7 +367,7 @@ 
         }
 
         //col7 - Prepare the Treegrid
-        $sOutputItem .= '"' . htmlspecialchars(stripslashes($record['folder']), ENT_QUOTES) . '"';
+        $sOutputItem .= '"'.htmlspecialchars(stripslashes($record['folder']), ENT_QUOTES).'"';
         //Finish the line
         $sOutputItem .= '], ';
         if ($getItemInList === true) {
@@ -376,16 +376,16 @@ 
             --$iTotal;
         }
     }
-    if (! empty($sOutputConst)) {
+    if (!empty($sOutputConst)) {
         $sOutput .= substr_replace($sOutputConst, '', -2);
     }
     $sOutput .= '], ';
-    $sOutput .= '"recordsTotal": ' . $iTotal . ', ';
-    $sOutput .= '"recordsFiltered": ' . $iTotal . ' }';
+    $sOutput .= '"recordsTotal": '.$iTotal.', ';
+    $sOutput .= '"recordsFiltered": '.$iTotal.' }';
     echo $sOutput;
 } elseif (isset($_GET['type']) && ($_GET['type'] === 'search_for_items' || $_GET['type'] === 'search_for_items_with_tags')) {
     include_once 'main.functions.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
     
     $arr_data = [];
     foreach ($rows as $record) {
@@ -405,7 +405,7 @@ 
 
         // Anyone can modify?
         $tmp = DB::queryfirstrow(
-            'SELECT anyone_can_modify FROM ' . prefixTable('items') . ' WHERE id = %i',
+            'SELECT anyone_can_modify FROM '.prefixTable('items').' WHERE id = %i',
             $record['id']
         );
         if (count($tmp) > 0) {
@@ -436,7 +436,7 @@ 
         // => récupérer un tableau contenant les roles associés à cet ID (a partir table restriction_to_roles)
         $user_is_included_in_role = 0;
         $roles = DB::query(
-            'SELECT role_id FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id=%i',
+            'SELECT role_id FROM '.prefixTable('restriction_to_roles').' WHERE item_id=%i',
             $record['id']
         );
         if (count($roles) > 0) {
@@ -459,7 +459,7 @@ 
             if (empty($restrictedTo)) {
                 $restrictedTo = $_SESSION['user_id'];
             } else {
-                $restrictedTo .= ',' . $_SESSION['user_id'];
+                $restrictedTo .= ','.$_SESSION['user_id'];
             }
         }
 
@@ -557,7 +557,7 @@ 
             $arrTmp = [];
             foreach (explode(';', $_SESSION['fonction_id']) as $role) {
                 $access = DB::queryFirstRow(
-                    'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i',
+                    'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i',
                     $role,
                     $record['id_tree']
                 );
@@ -606,8 +606,8 @@ 
         ) {
             $data_item = DB::queryFirstRow(
                 'SELECT i.pw AS pw, s.share_key AS share_key
-                FROM ' . prefixTable('items') . ' AS i
-                INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id)
+                FROM ' . prefixTable('items').' AS i
+                INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id)
                 WHERE i.id = %i AND s.user_id = %i',
                 $record['id'],
                 $_SESSION['user_id']
@@ -653,5 +653,5 @@ 
         'start' => (int) (isset($_GET['start']) === true && (int) $_GET['length'] !== -1) ? (int) $_GET['start'] + (int) $_GET['length'] : -1,
     ];
     echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$returnValues, 'encode');
+    $SETTINGS['cpassman_dir'], $returnValues, 'encode');
 }

sources/fields.queries.php

Spacing +7 added lines, -8 removed lines

@@ -256,7 +256,7 @@ 
 
             // Decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_label = filter_var($dataReceived['label'], FILTER_SANITIZE_STRING);
@@ -334,7 +334,7 @@ 
 
             // Decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_label = filter_var($dataReceived['label'], FILTER_SANITIZE_STRING);
@@ -409,7 +409,7 @@ 
 
             // Decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_idToRemove = filter_var($dataReceived['idToRemove'], FILTER_SANITIZE_NUMBER_INT);
@@ -506,7 +506,7 @@ 
 
             // Decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_label = filter_var($dataReceived['label'], FILTER_SANITIZE_STRING);
@@ -517,8 +517,7 @@ 
             $post_masked = filter_var($dataReceived['masked'], FILTER_SANITIZE_STRING);
             $post_encrypted = filter_var($dataReceived['encrypted'], FILTER_SANITIZE_STRING);
             $post_roles = filter_var_array($dataReceived['roles'], FILTER_SANITIZE_STRING);
-            $post_fieldId = isset($dataReceived['fieldId']) === false ? '' :
-                filter_var($dataReceived['fieldId'], FILTER_SANITIZE_NUMBER_INT);
+            $post_fieldId = isset($dataReceived['fieldId']) === false ? '' : filter_var($dataReceived['fieldId'], FILTER_SANITIZE_NUMBER_INT);
 
             if (empty($post_fieldId) === false) {
                 // UPDATE FIELD
@@ -533,7 +532,7 @@ 
                         'encrypted_data' => $post_encrypted,
                         'is_mandatory' => $post_mandatory,
                         'masked' => $post_masked,
-                        'role_visibility' => is_null($post_roles) === true || count($post_roles) ===0 ? '' : implode(',', $post_roles),
+                        'role_visibility' => is_null($post_roles) === true || count($post_roles) === 0 ? '' : implode(',', $post_roles),
                         'order' => calculateOrder($post_fieldId, $post_order),
                     ),
                     'id = %i',
@@ -632,7 +631,7 @@ 
 
             // Decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_label = filter_var($dataReceived['label'], FILTER_SANITIZE_STRING);

sources/main.queries.php

Spacing +110 added lines, -110 removed lines

@@ -45,8 +45,8 @@ 
 date_default_timezone_set(isset($SETTINGS['timezone']) === true ? $SETTINGS['timezone'] : 'UTC');
 
 // DO CHECKS
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 $post_type = filter_input(INPUT_POST, 'type', FILTER_SANITIZE_STRING);
 if (
     isset($post_type) === true
@@ -62,7 +62,7 @@ 
     && checkUser($_SESSION['user_id'], $_SESSION['key'], 'home', $SETTINGS) === false
 ) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 } elseif ((isset($_SESSION['user_id']) === true
         && isset($_SESSION['key'])) === true
@@ -74,7 +74,7 @@ 
     mainQuery($SETTINGS);
 } else {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
@@ -89,13 +89,13 @@ 
 
 
     // Includes
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
 
     // Connect to mysql server
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 
     DB::$host = DB_HOST;
     DB::$user = DB_USER;
@@ -105,7 +105,7 @@ 
     DB::$encoding = DB_ENCODING;
 
     // User's language loading
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
 
     // Prepare post variables
     $post_key = filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING);
@@ -225,7 +225,7 @@ 
             $pwdlib = new PasswordLib\PasswordLib();
             // generate key
             $key = $pwdlib->getRandomToken(filter_input(INPUT_POST, 'size', FILTER_SANITIZE_NUMBER_INT));
-            echo '[{"key" : "' . htmlentities($key, ENT_QUOTES) . '"}]';
+            echo '[{"key" : "'.htmlentities($key, ENT_QUOTES).'"}]';
             break;
 
         /*
@@ -254,7 +254,7 @@ 
                 )
             );
 
-            echo '[{"token" : "' . $token . '"}]';
+            echo '[{"token" : "'.$token.'"}]';
             break;
 
 
@@ -319,7 +319,7 @@ 
         case 'get_teampass_settings':
             // Encrypt data to return
             echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$SETTINGS, 'encode');
+    $SETTINGS['cpassman_dir'], $SETTINGS, 'encode');
 
             break;
 
@@ -504,7 +504,7 @@ 
     // get number of items
     DB::queryFirstRow(
         'SELECT increment_id
-        FROM ' . prefixTable('sharekeys_items') .
+        FROM ' . prefixTable('sharekeys_items').
         ' WHERE user_id = %i',
         $userId
     );
@@ -560,7 +560,7 @@ 
         // check if expected security level is reached
         $dataUser = DB::queryfirstrow(
             'SELECT *
-            FROM ' . prefixTable('users') . ' WHERE id = %i',
+            FROM ' . prefixTable('users').' WHERE id = %i',
             $post_user_id
         );
 
@@ -581,8 +581,8 @@ 
         if (empty($dataUser['fonction_id']) === false) {
             $data = DB::queryFirstRow(
                 'SELECT complexity
-                FROM ' . prefixTable('roles_title') . '
-                WHERE id IN (' . $dataUser['fonction_id'] . ')
+                FROM ' . prefixTable('roles_title').'
+                WHERE id IN (' . $dataUser['fonction_id'].')
                 ORDER BY complexity DESC'
             );
         } else {
@@ -596,8 +596,8 @@ 
     $SETTINGS['cpassman_dir'],
                 array(
                     'error' => true,
-                    'message' => '<div style="margin:10px 0 10px 15px;">' . langHdl('complexity_level_not_reached') . '.<br>' .
-                        langHdl('expected_complexity_level') . ': <b>' . TP_PW_COMPLEXITY[$data['complexity']][1] . '</b></div>',
+                    'message' => '<div style="margin:10px 0 10px 15px;">'.langHdl('complexity_level_not_reached').'.<br>'.
+                        langHdl('expected_complexity_level').': <b>'.TP_PW_COMPLEXITY[$data['complexity']][1].'</b></div>',
                 ),
                 'encode'
             );
@@ -703,14 +703,14 @@ 
         // Get data about user
         $data = DB::queryfirstrow(
             'SELECT id, email, pw
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE login = %s',
             $post_login
         );
     } else {
         $data = DB::queryfirstrow(
             'SELECT id, login, email, pw
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_id
         );
@@ -720,7 +720,7 @@ 
     $counter = DB::count();
 
     // load passwordLib library
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $pwdlib->register();
     $pwdlib = new PasswordLib\PasswordLib();
 
@@ -770,7 +770,7 @@ 
     }
     
     // generate new GA user code
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
     $tfa = new Authentication\TwoFactorAuth\TwoFactorAuth($SETTINGS['ga_website_name']);
     $gaSecretKey = $tfa->createSecret();
     $gaTemporaryCode = GenerateCryptKey(12, false, true, true, false, true, $SETTINGS);
@@ -810,7 +810,7 @@ 
                 'email' => $data['email'],
                 'email_result' => str_replace(
                     '#email#',
-                    '<b>' . obfuscateEmail($data['email']) . '</b>',
+                    '<b>'.obfuscateEmail($data['email']).'</b>',
                     addslashes(langHdl('admin_email_result_ok'))
                 ),
             ),
@@ -827,7 +827,7 @@ 
             'email' => $data['email'],
             'email_result' => str_replace(
                 '#email#',
-                '<b>' . obfuscateEmail($data['email']) . '</b>',
+                '<b>'.obfuscateEmail($data['email']).'</b>',
                 addslashes(langHdl('admin_email_result_ok'))
             ),
         ),
@@ -843,7 +843,7 @@ 
         && (int) $SETTINGS['enable_send_email_on_user_login'] === 1
     ) {
         $row = DB::queryFirstRow(
-            'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s',
+            'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s',
             'cron',
             'sending_emails'
         );
@@ -851,7 +851,7 @@ 
         if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) {
             $rows = DB::query(
                 'SELECT *
-                FROM ' . prefixTable('emails') .
+                FROM ' . prefixTable('emails').
                 ' WHERE status != %s',
                 'sent'
             );
@@ -957,8 +957,8 @@ 
     $arr_html = array();
     $rows = DB::query(
         'SELECT i.id AS id, i.label AS label, i.id_tree AS id_tree, l.date, i.perso AS perso, i.restricted_to AS restricted
-        FROM ' . prefixTable('log_items') . ' AS l
-        RIGHT JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id)
+        FROM ' . prefixTable('log_items').' AS l
+        RIGHT JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id)
         WHERE l.action = %s AND l.id_user = %i
         ORDER BY l.date DESC
         LIMIT 0, 100',
@@ -991,7 +991,7 @@ 
         isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1
         && ((int) $_SESSION['user_admin'] === 1 || (int) $_SESSION['user_manager'] === 1)
     ) {
-        DB::query('SELECT * FROM ' . prefixTable('suggestion'));
+        DB::query('SELECT * FROM '.prefixTable('suggestion'));
         $nb_suggestions_waiting = DB::count();
     }
 
@@ -1027,13 +1027,13 @@ 
             if ($data === 'stat_languages') {
                 $tmp = '';
                 foreach ($stats_data[$data] as $key => $value) {
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
                 }
                 $statsToSend[$data] = $tmp;
             } elseif ($data === 'stat_country') {
                 $tmp = '';
                 foreach ($stats_data[$data] as $key => $value) {
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
                 }
                 $statsToSend[$data] = $tmp;
             } else {
@@ -1107,8 +1107,8 @@ 
             if (strpos($line, 'cpassman_url') > 0 && empty($url_found) === true) {
                 $url_found = substr($line, 19, strlen($line) - 22);
                 $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
@@ -1135,7 +1135,7 @@ 
     $teampass_errors = '';
     $rows = DB::query(
         'SELECT label, date AS error_date
-        FROM ' . prefixTable('log_system') . "
+        FROM ' . prefixTable('log_system')."
         WHERE `type` LIKE 'error'
         ORDER BY `date` DESC
         LIMIT 0, 10"
@@ -1143,9 +1143,9 @@ 
     if (DB::count() > 0) {
         foreach ($rows as $record) {
             if (empty($teampass_errors) === true) {
-                $teampass_errors = ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
+                $teampass_errors = ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
             } else {
-                $teampass_errors .= ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
+                $teampass_errors .= ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
             }
         }
     }
@@ -1154,7 +1154,7 @@ 
 
     // Now prepare text
     $txt = '### Page on which it happened
-' . $post_data['current_page'] . '
+' . $post_data['current_page'].'
 
 ### Steps to reproduce
 1.
@@ -1169,39 +1169,39 @@ 
 Tell us what happens instead
 
 ### Server configuration
-**Operating system**: ' . php_uname() . '
+**Operating system**: ' . php_uname().'
 
-**Web server:** ' . $_SERVER['SERVER_SOFTWARE'] . '
+**Web server:** ' . $_SERVER['SERVER_SOFTWARE'].'
 
-**Database:** ' . ($link === false ? langHdl('undefined') : mysqli_get_server_info($link)) . '
+**Database:** ' . ($link === false ? langHdl('undefined') : mysqli_get_server_info($link)).'
 
-**PHP version:** ' . PHP_VERSION . '
+**PHP version:** ' . PHP_VERSION.'
 
-**Teampass version:** ' . TP_VERSION_FULL . '
+**Teampass version:** ' . TP_VERSION_FULL.'
 
 **Teampass configuration file:**
 ```
-' . $list_of_options . '
+' . $list_of_options.'
 ```
 
 **Updated from an older Teampass or fresh install:**
 
 ### Client configuration
 
-**Browser:** ' . $post_data['browser_name'] . ' - ' . $post_data['browser_version'] . '
+**Browser:** ' . $post_data['browser_name'].' - '.$post_data['browser_version'].'
 
-**Operating system:** ' . $post_data['os'] . ' - ' . $post_data['os_archi'] . 'bits
+**Operating system:** ' . $post_data['os'].' - '.$post_data['os_archi'].'bits
 
 ### Logs
 
 #### 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)
@@ -1230,7 +1230,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, private_key, pw, auth_type
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1238,7 +1238,7 @@ 
             // Get one item
             $record = DB::queryFirstRow(
                 'SELECT object_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE user_id = %i',
                 $post_user_id
             );
@@ -1246,7 +1246,7 @@ 
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key, increment_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['object_id'],
                 $post_user_id
@@ -1274,7 +1274,7 @@ 
             
             // Use the password check
             // load passwordLib library
-            $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+            $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
             $pwdlib->register();
             $pwdlib = new PasswordLib\PasswordLib();
             
@@ -1333,7 +1333,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1360,7 +1360,7 @@ 
             );
 
             // Load superGlobals
-            include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+            include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
             $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
             $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
@@ -1400,7 +1400,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT email, auth_type, login
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1540,7 +1540,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT email, auth_type, login
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1606,13 +1606,13 @@ 
         // Check if user exists
         DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
         if (DB::count() > 0) {
             // Include libraries
-            include_once $SETTINGS['cpassman_dir'] . '/sources/aes.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/aes.functions.php';
 
             // CLear old sharekeys
             if ($post_self_change === false) {
@@ -1667,7 +1667,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1677,7 +1677,7 @@ 
             $next_action = '';
 
             // Include libraries
-            include_once $SETTINGS['cpassman_dir'] . '/sources/aes.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/aes.functions.php';
 
             // WHAT STEP TO PERFORM?
             if ($post_action === 'step0') {
@@ -1840,15 +1840,15 @@ 
     // Loop on items
     $rows = DB::query(
         'SELECT id, pw
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key, increment_id
-            FROM ' . prefixTable('sharekeys_items') . '
+            FROM ' . prefixTable('sharekeys_items').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $_SESSION['user_id']
@@ -1876,7 +1876,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -1909,7 +1909,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0'
     );
 
@@ -1933,15 +1933,15 @@ 
     // Loop on logs
     $rows = DB::query(
         'SELECT increment_id
-        FROM ' . prefixTable('log_items') . '
+        FROM ' . prefixTable('log_items').'
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_logs') . '
+            FROM ' . prefixTable('sharekeys_logs').'
             WHERE object_id = %i AND user_id = %i',
             $record['increment_id'],
             $_SESSION['user_id']
@@ -1968,7 +1968,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -1990,7 +1990,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT increment_id
-        FROM ' . prefixTable('log_items') . '
+        FROM ' . prefixTable('log_items').'
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"'
     );
 
@@ -2014,15 +2014,15 @@ 
     // Loop on fields
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_fields') . '
+            FROM ' . prefixTable('sharekeys_fields').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $_SESSION['user_id']
@@ -2049,7 +2049,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2071,7 +2071,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"'
     );
 
@@ -2095,14 +2095,14 @@ 
     // Loop on suggestions
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('suggestion') . '
-        LIMIT ' . $post_start . ', ' . $post_length
+        FROM ' . prefixTable('suggestion').'
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_suggestions') . '
+            FROM ' . prefixTable('sharekeys_suggestions').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $_SESSION['user_id']
@@ -2129,7 +2129,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2174,15 +2174,15 @@ 
     // Loop on files
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('files') . '
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"
-        LIMIT ' . $post_start . ', ' . $post_length
+        FROM ' . prefixTable('files').'
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"
+        LIMIT ' . $post_start.', '.$post_length
     ); //aes_encryption
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_files') . '
+            FROM ' . prefixTable('sharekeys_files').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $_SESSION['user_id']
@@ -2209,7 +2209,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2231,8 +2231,8 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('files') . '
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"'
+        FROM ' . prefixTable('files').'
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"'
     );
 
     $next_start = (int) $post_start + (int) $post_length;
@@ -2264,16 +2264,16 @@ 
     if (count($_SESSION['personal_folders']) > 0) {
         $rows = DB::query(
             'SELECT id, pw
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE perso = 1 AND id_tree IN %ls
-            LIMIT ' . $post_start . ', ' . $post_length,
+            LIMIT ' . $post_start.', '.$post_length,
             $_SESSION['personal_folders']
         );
         foreach ($rows as $record) {
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key, increment_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 $_SESSION['user_id']
@@ -2300,7 +2300,7 @@ 
                 if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                     $currentUserKey = DB::queryFirstRow(
                         'SELECT increment_id
-                        FROM ' . prefixTable('sharekeys_items') . '
+                        FROM ' . prefixTable('sharekeys_items').'
                         WHERE object_id = %i AND user_id = %i',
                         $record['id'],
                         $post_user_id
@@ -2323,7 +2323,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0'
     );
 
@@ -2347,7 +2347,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, encrypted_psk
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2373,9 +2373,9 @@ 
                 // Loop on persoanl items
                 $rows = DB::query(
                     'SELECT id, pw
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE perso = 1 AND id_tree IN %ls
-                    LIMIT ' . $post_start . ', ' . $post_length,
+                    LIMIT ' . $post_start.', '.$post_length,
                     $_SESSION['personal_folders']
                 );
                 $countUserPersonalItems = DB::count();
@@ -2418,7 +2418,7 @@ 
                         // Loop on files
                         $rows = DB::query(
                             'SELECT id, file
-                            FROM ' . prefixTable('files') . '
+                            FROM ' . prefixTable('files').'
                             WHERE status != %s
                             AND id_item = %i',
                             TP_ENCRYPTION_NAME,
@@ -2429,14 +2429,14 @@ 
                             // Now decrypt the file
                             prepareFileWithDefuse(
                                 'decrypt',
-                                $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'],
-                                $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'] . '.delete',
+                                $SETTINGS['path_to_upload_folder'].'/'.$record2['file'],
+                                $SETTINGS['path_to_upload_folder'].'/'.$record2['file'].'.delete',
                                 $SETTINGS,
                                 $post_user_psk
                             );
 
                             // Encrypt the file
-                            $encryptedFile = encryptFile($record2['file'] . '.delete', $SETTINGS['path_to_upload_folder']);
+                            $encryptedFile = encryptFile($record2['file'].'.delete', $SETTINGS['path_to_upload_folder']);
 
                             DB::update(
                                 prefixTable('files'),
@@ -2459,7 +2459,7 @@ 
                             );
 
                             // Unlink original file
-                            unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']);
+                            unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']);
                         }
                     }
                 }
@@ -2531,7 +2531,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT '.$post_fields.'
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2568,7 +2568,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT auth_type, login, private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2579,7 +2579,7 @@ 
             $privateKey = decryptPrivateKey($post_current_pwd, $userData['private_key']);
 
             // Load superGlobals
-            include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+            include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
             $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
             if ($superGlobal->get('private_key', 'SESSION', 'user') === $privateKey) {
@@ -2613,7 +2613,7 @@ 
     $SETTINGS['cpassman_dir'],
                     array(
                         'error' => false,
-                        'message' => langHdl('done'),'',
+                        'message' => langHdl('done'), '',
                     ),
                     'encode'
                 );
@@ -2653,7 +2653,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT auth_type, login, private_key, special
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2683,7 +2683,7 @@ 
                 );
 
                 // Load superGlobals
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
                 $superGlobal = new protect\SuperGlobal\SuperGlobal();
                 $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
 
@@ -2691,7 +2691,7 @@ 
     $SETTINGS['cpassman_dir'],
                     array(
                         'error' => false,
-                        'message' => langHdl('done'),'',
+                        'message' => langHdl('done'), '',
                     ),
                     'encode'
                 );
@@ -2716,14 +2716,14 @@ 
             // Get one item
             $record = DB::queryFirstRow(
                 'SELECT id, pw
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE perso = 0'
             );
 
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key, increment_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 $post_user_id
@@ -2751,7 +2751,7 @@ 
                     );
                     
                     // Load superGlobals
-                    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+                    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
                     $superGlobal = new protect\SuperGlobal\SuperGlobal();
                     $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
 
@@ -2808,7 +2808,7 @@ 
             $_SESSION['user_id']
         );
         // Return data
-        return '[{"new_value":"' . $_SESSION['sessionDuration'] . '"}]';
+        return '[{"new_value":"'.$_SESSION['sessionDuration'].'"}]';
     }
     
     return '[{"new_value":"expired"}]';

sources/utilities.queries.php

Spacing +30 added lines, -30 removed lines

@@ -37,12 +37,12 @@ 
 }
 
 // Do checks
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'utilities.database', $SETTINGS) === false) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
@@ -55,14 +55,14 @@ 
     date_default_timezone_set('UTC');
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 header('Content-type: text/html; charset=utf-8');
 header('Cache-Control: no-cache, must-revalidate');
 require_once 'main.functions.php';
 
 //Connect to DB
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -104,7 +104,7 @@ 
             $arrFolders = array();
             $rows = DB::query(
                 'SELECT valeur, intitule
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE type  = %s',
                 'folder_deleted'
             );
@@ -125,10 +125,10 @@ 
                 'SELECT u.login as login, u.name as name, u.lastname as lastname,
                 i.id as id, i.label as label,
                 i.id_tree as id_tree, l.date as date, n.title as folder_title
-                FROM ' . prefixTable('log_items') . ' as l
-                INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id)
-                INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
-                INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree=n.id)
+                FROM ' . prefixTable('log_items').' as l
+                INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id)
+                INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
+                INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree=n.id)
                 WHERE i.inactif = %i
                 AND l.action = %s',
                 1,
@@ -150,7 +150,7 @@ 
                             'label' => $record['label'],
                             'date' => date($SETTINGS['date_format'], (int) $record['date']),
                             'login' => $record['login'],
-                            'name' => $record['name'] . ' ' . $record['lastname'],
+                            'name' => $record['name'].' '.$record['lastname'],
                             'folder_label' => $record['folder_title'],
                             'folder_deleted' => $thisFolder,
                         )
@@ -199,7 +199,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_folders = filter_var_array($dataReceived['folders'], FILTER_SANITIZE_STRING);
@@ -209,10 +209,10 @@ 
             foreach ($post_folders as $folderId) {
                 $data = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . "
+                    FROM ' . prefixTable('misc')."
                     WHERE type = 'folder_deleted'
                     AND intitule = %s",
-                    'f' . $folderId
+                    'f'.$folderId
                 );
                 if ((int) $data['valeur'] !== 0) {
                     $folderData = explode(', ', $data['valeur']);
@@ -238,7 +238,7 @@ 
                         prefixTable('misc'),
                         'type = %s AND intitule = %s',
                         'folder_deleted',
-                        'f' . $folderId
+                        'f'.$folderId
                     );
 
                     // Restore all items in this folder
@@ -254,7 +254,7 @@ 
                     // Get list of all items in thos folder
                     $items = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id_tree = %i',
                         $folderId
                     );
@@ -333,7 +333,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_folders = filter_var_array($dataReceived['folders'], FILTER_SANITIZE_STRING);
@@ -343,10 +343,10 @@ 
             foreach ($post_folders as $folderId) {
                 $data = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . "
+                    FROM ' . prefixTable('misc')."
                     WHERE type = 'folder_deleted'
                     AND intitule = %s",
-                    'f' . $folderId
+                    'f'.$folderId
                 );
                 if ((int) $data['valeur'] !== 0) {
                     $folderData = explode(', ', $data['valeur']);
@@ -378,7 +378,7 @@ 
                         prefixTable('misc'),
                         'type = %s AND intitule = %s',
                         'folder_deleted',
-                        'f' . $folderData[0]
+                        'f'.$folderData[0]
                     );
 
                     // Delete all items in this folder
@@ -392,7 +392,7 @@ 
                     // Get list of all items in thos folder
                     $items = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id_tree = %i',
                         $folderData[0]
                     );
@@ -464,7 +464,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_log_type = filter_var($dataReceived['dataType'], FILTER_SANITIZE_STRING);
@@ -492,7 +492,7 @@ 
             ) {
                 if ($post_log_type === 'items') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_items') . '
+                        'SELECT * FROM '.prefixTable('log_items').'
                         WHERE (date BETWEEN %i AND %i)'
                         . ($post_filter_action === 'all' ? '' : ' AND action = "'.$post_filter_action.'"')
                         . ((int) $post_filter_user === -1 ? '' : ' AND id_user = '.(int) $post_filter_user),
@@ -512,7 +512,7 @@ 
                 } elseif ($post_log_type === 'connections') {
                     //db::debugmode(true);
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . '
+                        'SELECT * FROM '.prefixTable('log_system').'
                         WHERE type=%s '
                         . 'AND (date BETWEEN %i AND %i)'
                         . ($post_filter_action === 'all' ? '' : ' AND action = '.$post_filter_action)
@@ -535,12 +535,12 @@ 
                     );
                 } elseif ($post_log_type === 'errors') {
                     //db::debugmode(true);
-                    echo 'SELECT * FROM ' . prefixTable('log_items') . '
+                    echo 'SELECT * FROM '.prefixTable('log_items').'
                     WHERE (date BETWEEN '.$post_date_from.' AND '.$post_date_to.')'
                     . ($post_filter_action === 'all' ? '' : ' AND action = '.$post_filter_action)
                     . ((int) $post_filter_user === -1 ? '' : ' AND id_user = '.(int) $post_filter_user);
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'error',
                         $post_date_from,
@@ -557,7 +557,7 @@ 
                     );
                 } elseif ($post_log_type === 'copy') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_items') . ' WHERE action=%s ' .
+                        'SELECT * FROM '.prefixTable('log_items').' WHERE action=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'at_copy',
                         $post_date_from,
@@ -574,7 +574,7 @@ 
                     );
                 } elseif ($post_log_type === 'admin') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'admin_action',
                         $post_date_from,
@@ -591,7 +591,7 @@ 
                     );
                 } elseif ($post_log_type === 'failed') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'failed_auth',
                         $post_date_from,

sources/roles.queries.php

Spacing +4 added lines, -4 removed lines

@@ -191,7 +191,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_selectedFolders = filter_var_array($dataReceived['selectedFolders'], FILTER_SANITIZE_NUMBER_INT);
@@ -281,7 +281,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_folderId = filter_var($dataReceived['folderId'], FILTER_SANITIZE_NUMBER_INT);
@@ -467,7 +467,7 @@ 
 
             // send data
             echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$return, 'encode');
+    $SETTINGS['cpassman_dir'], $return, 'encode');
             break;
 
         case 'delete_role':
@@ -496,7 +496,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_roleId = filter_var($dataReceived['roleId'], FILTER_SANITIZE_NUMBER_INT);