@@ -50,22 +50,22 @@ discard block |
||
| 50 | 50 | // Load AntiXSS |
| 51 | 51 | include_once '../includes/libraries/voku/helper/AntiXSS.php'; |
| 52 | 52 | $antiXss = new voku\helper\AntiXSS(); |
| 53 | - if (! headers_sent()) { //If headers not sent yet... then do php redirect |
|
| 54 | - header('Location: ' . $antiXss->xss_clean($url)); |
|
| 53 | + if (!headers_sent()) { //If headers not sent yet... then do php redirect |
|
| 54 | + header('Location: '.$antiXss->xss_clean($url)); |
|
| 55 | 55 | return; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | //If headers are sent... do java redirect... if java disabled, do html redirect. |
| 59 | 59 | echo '<script type="text/javascript">'; |
| 60 | - echo 'window.location.href="' . $antiXss->xss_clean($url) . '";'; |
|
| 60 | + echo 'window.location.href="'.$antiXss->xss_clean($url).'";'; |
|
| 61 | 61 | echo '</script>'; |
| 62 | 62 | echo '<noscript>'; |
| 63 | - echo '<meta http-equiv="refresh" content="0;url=' . $antiXss->xss_clean($url) . '" />'; |
|
| 63 | + echo '<meta http-equiv="refresh" content="0;url='.$antiXss->xss_clean($url).'" />'; |
|
| 64 | 64 | echo '</noscript>'; |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | // Include files |
| 68 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 68 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 69 | 69 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 70 | 70 | // Prepare GET variables |
| 71 | 71 | $get_group = $superGlobal->get('group', 'GET'); |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | && isset($SETTINGS['enable_sts']) === true |
| 76 | 76 | && (int) $SETTINGS['enable_sts'] === 1 |
| 77 | 77 | ) { |
| 78 | - redirect('https://' . $superGlobal->get('HTTP_HOST', 'SERVER') . $superGlobal->get('REQUEST_URI', 'SERVER')); |
|
| 78 | + redirect('https://'.$superGlobal->get('HTTP_HOST', 'SERVER').$superGlobal->get('REQUEST_URI', 'SERVER')); |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | // Load pwComplexity |
@@ -100,11 +100,11 @@ discard block |
||
| 100 | 100 | // LOAD CPASSMAN SETTINGS |
| 101 | 101 | if ( |
| 102 | 102 | isset($SETTINGS['cpassman_dir']) === true |
| 103 | - && is_dir($SETTINGS['cpassman_dir'] . '/install') === true |
|
| 103 | + && is_dir($SETTINGS['cpassman_dir'].'/install') === true |
|
| 104 | 104 | ) { |
| 105 | 105 | // Should we delete folder INSTALL? |
| 106 | 106 | $row = DB::queryFirstRow( |
| 107 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type=%s AND intitule=%s', |
|
| 107 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type=%s AND intitule=%s', |
|
| 108 | 108 | 'install', |
| 109 | 109 | 'clear_install_folder' |
| 110 | 110 | ); |
@@ -118,11 +118,11 @@ discard block |
||
| 118 | 118 | if ($directories !== false) { |
| 119 | 119 | $files = array_diff($directories, ['.', '..']); |
| 120 | 120 | foreach ($files as $file) { |
| 121 | - if (is_dir($dir . '/' . $file)) { |
|
| 122 | - delTree($dir . '/' . $file); |
|
| 121 | + if (is_dir($dir.'/'.$file)) { |
|
| 122 | + delTree($dir.'/'.$file); |
|
| 123 | 123 | } else { |
| 124 | 124 | try { |
| 125 | - unlink($dir . '/' . $file); |
|
| 125 | + unlink($dir.'/'.$file); |
|
| 126 | 126 | } catch (Exception $e) { |
| 127 | 127 | // do nothing... php will ignore and continue |
| 128 | 128 | } |
@@ -135,13 +135,13 @@ discard block |
||
| 135 | 135 | } |
| 136 | 136 | } |
| 137 | 137 | |
| 138 | - if (is_dir($SETTINGS['cpassman_dir'] . '/install')) { |
|
| 138 | + if (is_dir($SETTINGS['cpassman_dir'].'/install')) { |
|
| 139 | 139 | // Set the permissions on the install directory and delete |
| 140 | 140 | // is server Windows or Linux? |
| 141 | 141 | if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') { |
| 142 | - recursiveChmod($SETTINGS['cpassman_dir'] . '/install', 0755, 0440); |
|
| 142 | + recursiveChmod($SETTINGS['cpassman_dir'].'/install', 0755, 0440); |
|
| 143 | 143 | } |
| 144 | - delTree($SETTINGS['cpassman_dir'] . '/install'); |
|
| 144 | + delTree($SETTINGS['cpassman_dir'].'/install'); |
|
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | // Delete temporary install table |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | // Load Languages stuff |
| 160 | 160 | if (isset($languagesList) === false) { |
| 161 | 161 | $languagesList = []; |
| 162 | - $rows = DB::query('SELECT * FROM ' . prefixTable('languages') . ' GROUP BY name, label, code, flag, id ORDER BY name ASC'); |
|
| 162 | + $rows = DB::query('SELECT * FROM '.prefixTable('languages').' GROUP BY name, label, code, flag, id ORDER BY name ASC'); |
|
| 163 | 163 | foreach ($rows as $record) { |
| 164 | 164 | array_push($languagesList, $record['name']); |
| 165 | 165 | if (isset($_SESSION['user_language']) && $record['name'] === $_SESSION['user_language']) { |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | // CHECK IF SESSION EXISTS AND IF SESSION IS VALID |
| 218 | 218 | if (empty($_SESSION['sessionDuration']) === false) { |
| 219 | 219 | $dataSession = DB::queryFirstRow( |
| 220 | - 'SELECT key_tempo FROM ' . prefixTable('users') . ' WHERE id=%i', |
|
| 220 | + 'SELECT key_tempo FROM '.prefixTable('users').' WHERE id=%i', |
|
| 221 | 221 | $_SESSION['user_id'] |
| 222 | 222 | ); |
| 223 | 223 | } else { |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | && (isset($_SESSION['user_admin']) === true && $_SESSION['user_admin'] === 1) |
| 282 | 282 | ) { |
| 283 | 283 | $row = DB::queryFirstRow( |
| 284 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type=%s_type AND intitule=%s_intitule', |
|
| 284 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type=%s_type AND intitule=%s_intitule', |
|
| 285 | 285 | [ |
| 286 | 286 | 'type' => 'admin', |
| 287 | 287 | 'intitule' => 'cpassman_version', |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | |
| 342 | 342 | syslog( |
| 343 | 343 | LOG_WARNING, |
| 344 | - 'Unlog user: ' . date('Y/m/d H:i:s') . " {$_SERVER['REMOTE_ADDR']} ({$_SERVER['HTTP_USER_AGENT']})" |
|
| 344 | + 'Unlog user: '.date('Y/m/d H:i:s')." {$_SERVER['REMOTE_ADDR']} ({$_SERVER['HTTP_USER_AGENT']})" |
|
| 345 | 345 | ); |
| 346 | 346 | // erase session table |
| 347 | 347 | $_SESSION = []; |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | if (isset($_SESSION['user_id']) === true && empty($_SESSION['user_id']) === false) { |
| 393 | 393 | // query on user |
| 394 | 394 | $data = DB::queryfirstrow( |
| 395 | - 'SELECT login, admin, gestionnaire, can_manage_all_users, groupes_visibles, groupes_interdits, fonction_id, last_connexion FROM ' . prefixTable('users') . ' WHERE id=%i', |
|
| 395 | + 'SELECT login, admin, gestionnaire, can_manage_all_users, groupes_visibles, groupes_interdits, fonction_id, last_connexion FROM '.prefixTable('users').' WHERE id=%i', |
|
| 396 | 396 | $_SESSION['user_id'] |
| 397 | 397 | ); |
| 398 | 398 | //Check if user has been deleted or unlogged |
@@ -473,7 +473,7 @@ discard block |
||
| 473 | 473 | $_SESSION['item_fields'] = []; |
| 474 | 474 | $rows = DB::query( |
| 475 | 475 | 'SELECT * |
| 476 | - FROM ' . prefixTable('categories') . ' |
|
| 476 | + FROM ' . prefixTable('categories').' |
|
| 477 | 477 | WHERE level=%i', |
| 478 | 478 | '0' |
| 479 | 479 | ); |
@@ -482,7 +482,7 @@ discard block |
||
| 482 | 482 | // get each field |
| 483 | 483 | $rows2 = DB::query( |
| 484 | 484 | 'SELECT * |
| 485 | - FROM ' . prefixTable('categories') . ' |
|
| 485 | + FROM ' . prefixTable('categories').' |
|
| 486 | 486 | WHERE parent_id=%i |
| 487 | 487 | ORDER BY `order` ASC', |
| 488 | 488 | $record['id'] |
@@ -559,7 +559,7 @@ discard block |
||
| 559 | 559 | if ( |
| 560 | 560 | isset($SETTINGS['roles_allowed_to_print']) === true |
| 561 | 561 | && isset($_SESSION['user_roles']) === true |
| 562 | - && (! isset($_SESSION['temporary']['user_can_printout']) || empty($_SESSION['temporary']['user_can_printout'])) |
|
| 562 | + && (!isset($_SESSION['temporary']['user_can_printout']) || empty($_SESSION['temporary']['user_can_printout'])) |
|
| 563 | 563 | ) { |
| 564 | 564 | foreach (explode(';', $SETTINGS['roles_allowed_to_print']) as $role) { |
| 565 | 565 | if (in_array($role, $_SESSION['user_roles']) === true) { |
@@ -569,5 +569,5 @@ discard block |
||
| 569 | 569 | } |
| 570 | 570 | |
| 571 | 571 | /* CHECK NUMBER OF USER ONLINE */ |
| 572 | -DB::query('SELECT * FROM ' . prefixTable('users') . ' WHERE timestamp>=%i', time() - 600); |
|
| 572 | +DB::query('SELECT * FROM '.prefixTable('users').' WHERE timestamp>=%i', time() - 600); |
|
| 573 | 573 | $_SESSION['nb_users_online'] = DB::count(); |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | require_once 'SecureHandler.php'; |
| 29 | 29 | session_name('teampass_session'); |
| 30 | 30 | session_start(); |
| 31 | -if (! isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || ! isset($_SESSION['key']) || empty($_SESSION['key'])) { |
|
| 31 | +if (!isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || !isset($_SESSION['key']) || empty($_SESSION['key'])) { |
|
| 32 | 32 | die('Hacking attempt...'); |
| 33 | 33 | } |
| 34 | 34 | |
@@ -37,12 +37,12 @@ discard block |
||
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | // Do checks |
| 40 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 41 | -require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php'; |
|
| 40 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 41 | +require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
|
| 42 | 42 | if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'items', $SETTINGS) === false) { |
| 43 | 43 | // Not allowed page |
| 44 | 44 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 45 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 45 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 46 | 46 | exit; |
| 47 | 47 | } |
| 48 | 48 | |
@@ -55,8 +55,8 @@ discard block |
||
| 55 | 55 | date_default_timezone_set('UTC'); |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php'; |
|
| 59 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 58 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php'; |
|
| 59 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 60 | 60 | header('Content-type: text/html; charset=utf-8'); |
| 61 | 61 | header('Cache-Control: no-cache, must-revalidate'); |
| 62 | 62 | require_once 'main.functions.php'; |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | // Connect to mysql server |
| 81 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 81 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 82 | 82 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 83 | 83 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 84 | 84 | } |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | DB::$encoding = DB_ENCODING; |
| 91 | 91 | |
| 92 | 92 | // Class loader |
| 93 | -require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 93 | +require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 94 | 94 | |
| 95 | 95 | // Load Tree |
| 96 | 96 | $tree = new SplClassLoader('Tree\NestedTree', '../includes/libraries'); |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 99 | 99 | |
| 100 | 100 | // Superglobal library |
| 101 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 101 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 102 | 102 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 103 | 103 | |
| 104 | 104 | // Prepare POST variables |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | // About special settings |
| 316 | 316 | $dataFolderSettings = DB::queryFirstRow( |
| 317 | 317 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 318 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 318 | + FROM ' . prefixTable('nested_tree').' |
|
| 319 | 319 | WHERE id = %i', |
| 320 | 320 | $post_folder_id |
| 321 | 321 | ); |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | // Get folder complexity |
| 331 | 331 | $folderComplexity = DB::queryfirstrow( |
| 332 | 332 | 'SELECT valeur |
| 333 | - FROM ' . prefixTable('misc') . ' |
|
| 333 | + FROM ' . prefixTable('misc').' |
|
| 334 | 334 | WHERE type = %s AND intitule = %i', |
| 335 | 335 | 'complex', |
| 336 | 336 | $post_folder_id |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | $itemExists = 0; |
| 356 | 356 | $newID = ''; |
| 357 | 357 | $data = DB::queryfirstrow( |
| 358 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 358 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 359 | 359 | WHERE label = %s AND inactif = %i', |
| 360 | 360 | $post_label, |
| 361 | 361 | 0 |
@@ -481,7 +481,7 @@ discard block |
||
| 481 | 481 | // should we encrypt the data |
| 482 | 482 | $dataTmp = DB::queryFirstRow( |
| 483 | 483 | 'SELECT encrypted_data |
| 484 | - FROM ' . prefixTable('categories') . ' |
|
| 484 | + FROM ' . prefixTable('categories').' |
|
| 485 | 485 | WHERE id = %i', |
| 486 | 486 | $field_data[0] |
| 487 | 487 | ); |
@@ -537,7 +537,7 @@ discard block |
||
| 537 | 537 | ) { |
| 538 | 538 | DB::queryFirstRow( |
| 539 | 539 | 'SELECT * |
| 540 | - FROM ' . prefixTable('templates') . ' |
|
| 540 | + FROM ' . prefixTable('templates').' |
|
| 541 | 541 | WHERE item_id = %i', |
| 542 | 542 | $newID |
| 543 | 543 | ); |
@@ -606,11 +606,11 @@ discard block |
||
| 606 | 606 | ) { |
| 607 | 607 | foreach ($post_restricted_to as $userRest) { |
| 608 | 608 | if (empty($userRest) === false) { |
| 609 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest); |
|
| 609 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest); |
|
| 610 | 610 | if (empty($listOfRestricted)) { |
| 611 | 611 | $listOfRestricted = $dataTmp['login']; |
| 612 | 612 | } else { |
| 613 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 613 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 614 | 614 | } |
| 615 | 615 | } |
| 616 | 616 | } |
@@ -623,11 +623,11 @@ discard block |
||
| 623 | 623 | if (empty($data['restricted_to']) === false) { |
| 624 | 624 | foreach (explode(';', $data['restricted_to']) as $userRest) { |
| 625 | 625 | if (empty($userRest) === false) { |
| 626 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
| 626 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
| 627 | 627 | if (empty($oldRestrictionList) === true) { |
| 628 | 628 | $oldRestrictionList = $dataTmp['login']; |
| 629 | 629 | } else { |
| 630 | - $oldRestrictionList .= ';' . $dataTmp['login']; |
|
| 630 | + $oldRestrictionList .= ';'.$dataTmp['login']; |
|
| 631 | 631 | } |
| 632 | 632 | } |
| 633 | 633 | } |
@@ -690,7 +690,7 @@ discard block |
||
| 690 | 690 | if (empty($post_uploaded_file_id) === false) { |
| 691 | 691 | $rows = DB::query( |
| 692 | 692 | 'SELECT id |
| 693 | - FROM ' . prefixTable('files') . ' |
|
| 693 | + FROM ' . prefixTable('files').' |
|
| 694 | 694 | WHERE id_item = %s', |
| 695 | 695 | $post_uploaded_file_id |
| 696 | 696 | ); |
@@ -730,14 +730,14 @@ discard block |
||
| 730 | 730 | langHdl('email_subject'), |
| 731 | 731 | str_replace( |
| 732 | 732 | array('#label', '#link'), |
| 733 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $post_folder_id . '&id=' . $newID . $txt['email_body3']), |
|
| 733 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$post_folder_id.'&id='.$newID.$txt['email_body3']), |
|
| 734 | 734 | langHdl('new_item_email_body') |
| 735 | 735 | ), |
| 736 | 736 | $emailAddress, |
| 737 | 737 | $SETTINGS, |
| 738 | 738 | str_replace( |
| 739 | 739 | array('#label', '#link'), |
| 740 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $post_folder_id . '&id=' . $newID . $txt['email_body3']), |
|
| 740 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$post_folder_id.'&id='.$newID.$txt['email_body3']), |
|
| 741 | 741 | langHdl('new_item_email_body') |
| 742 | 742 | ) |
| 743 | 743 | ); |
@@ -903,7 +903,7 @@ discard block |
||
| 903 | 903 | // About special settings |
| 904 | 904 | $dataFolderSettings = DB::queryFirstRow( |
| 905 | 905 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 906 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 906 | + FROM ' . prefixTable('nested_tree').' |
|
| 907 | 907 | WHERE id = %i', |
| 908 | 908 | $post_folder_id |
| 909 | 909 | ); |
@@ -918,7 +918,7 @@ discard block |
||
| 918 | 918 | // Get folder complexity |
| 919 | 919 | $folderComplexity = DB::queryfirstrow( |
| 920 | 920 | 'SELECT valeur |
| 921 | - FROM ' . prefixTable('misc') . ' |
|
| 921 | + FROM ' . prefixTable('misc').' |
|
| 922 | 922 | WHERE type = %s AND intitule = %i', |
| 923 | 923 | 'complex', |
| 924 | 924 | $post_folder_id |
@@ -957,8 +957,8 @@ discard block |
||
| 957 | 957 | // Get all informations for this item |
| 958 | 958 | $dataItem = DB::queryfirstrow( |
| 959 | 959 | 'SELECT * |
| 960 | - FROM ' . prefixTable('items') . ' as i |
|
| 961 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 960 | + FROM ' . prefixTable('items').' as i |
|
| 961 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 962 | 962 | WHERE i.id=%i AND l.action = %s', |
| 963 | 963 | $post_item_id, |
| 964 | 964 | 'at_creation' |
@@ -968,7 +968,7 @@ discard block |
||
| 968 | 968 | //db::debugmode(true); |
| 969 | 969 | DB::query( |
| 970 | 970 | 'SELECT * |
| 971 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 971 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 972 | 972 | WHERE object_id = %i AND user_id = %s', |
| 973 | 973 | $post_item_id, |
| 974 | 974 | $_SESSION['user_id'] |
@@ -1017,9 +1017,9 @@ discard block |
||
| 1017 | 1017 | 'SELECT i.id as id, i.label as label, i.description as description, i.pw as pw, i.url as url, i.id_tree as id_tree, i.perso as perso, i.login as login, |
| 1018 | 1018 | i.inactif as inactif, i.restricted_to as restricted_to, i.anyone_can_modify as anyone_can_modify, i.email as email, i.notification as notification, |
| 1019 | 1019 | u.login as user_login, u.email as user_email |
| 1020 | - FROM ' . prefixTable('items') . ' as i |
|
| 1021 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item) |
|
| 1022 | - INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user) |
|
| 1020 | + FROM ' . prefixTable('items').' as i |
|
| 1021 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item) |
|
| 1022 | + INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user) |
|
| 1023 | 1023 | WHERE i.id=%i', |
| 1024 | 1024 | $post_item_id |
| 1025 | 1025 | ); |
@@ -1027,7 +1027,7 @@ discard block |
||
| 1027 | 1027 | // Should we log a password change? |
| 1028 | 1028 | $userKey = DB::queryFirstRow( |
| 1029 | 1029 | 'SELECT share_key |
| 1030 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1030 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1031 | 1031 | WHERE user_id = %i AND object_id = %i', |
| 1032 | 1032 | $_SESSION['user_id'], |
| 1033 | 1033 | $post_item_id |
@@ -1086,7 +1086,7 @@ discard block |
||
| 1086 | 1086 | // Get list of tags |
| 1087 | 1087 | $itemTags = DB::queryFirstColumn( |
| 1088 | 1088 | 'SELECT tag |
| 1089 | - FROM ' . prefixTable('tags') . ' |
|
| 1089 | + FROM ' . prefixTable('tags').' |
|
| 1090 | 1090 | WHERE item_id = %i', |
| 1091 | 1091 | $post_item_id |
| 1092 | 1092 | ); |
@@ -1130,7 +1130,7 @@ discard block |
||
| 1130 | 1130 | $_SESSION['user_id'], |
| 1131 | 1131 | 'at_modification', |
| 1132 | 1132 | $_SESSION['login'], |
| 1133 | - 'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags |
|
| 1133 | + 'at_tag : '.implode(' ', $itemTags).' => '.$post_tags |
|
| 1134 | 1134 | ); |
| 1135 | 1135 | } |
| 1136 | 1136 | |
@@ -1170,8 +1170,8 @@ discard block |
||
| 1170 | 1170 | 'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv, |
| 1171 | 1171 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, |
| 1172 | 1172 | c.masked AS masked, i.id AS field_item_id |
| 1173 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 1174 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 1173 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 1174 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 1175 | 1175 | WHERE i.field_id = %i AND i.item_id = %i', |
| 1176 | 1176 | $field['id'], |
| 1177 | 1177 | $post_item_id |
@@ -1185,7 +1185,7 @@ discard block |
||
| 1185 | 1185 | // Perform new query |
| 1186 | 1186 | $dataTmpCat = DB::queryFirstRow( |
| 1187 | 1187 | 'SELECT id, title, encrypted_data, masked |
| 1188 | - FROM ' . prefixTable('categories') . ' |
|
| 1188 | + FROM ' . prefixTable('categories').' |
|
| 1189 | 1189 | WHERE id = %i', |
| 1190 | 1190 | $field['id'] |
| 1191 | 1191 | ); |
@@ -1257,7 +1257,7 @@ discard block |
||
| 1257 | 1257 | $_SESSION['user_id'], |
| 1258 | 1258 | 'at_modification', |
| 1259 | 1259 | $_SESSION['login'], |
| 1260 | - 'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value'] |
|
| 1260 | + 'at_field : '.$dataTmpCat['title'].' : '.$field['value'] |
|
| 1261 | 1261 | ); |
| 1262 | 1262 | } else { |
| 1263 | 1263 | // compare the old and new value |
@@ -1265,7 +1265,7 @@ discard block |
||
| 1265 | 1265 | // Get user sharekey for this field |
| 1266 | 1266 | $userKey = DB::queryFirstRow( |
| 1267 | 1267 | 'SELECT share_key |
| 1268 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 1268 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 1269 | 1269 | WHERE user_id = %i AND object_id = %i', |
| 1270 | 1270 | $_SESSION['user_id'], |
| 1271 | 1271 | $dataTmpCat['field_item_id'] |
@@ -1334,7 +1334,7 @@ discard block |
||
| 1334 | 1334 | $_SESSION['user_id'], |
| 1335 | 1335 | 'at_modification', |
| 1336 | 1336 | $_SESSION['login'], |
| 1337 | - 'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal |
|
| 1337 | + 'at_field : '.$dataTmpCat['title'].' => '.$oldVal |
|
| 1338 | 1338 | ); |
| 1339 | 1339 | } |
| 1340 | 1340 | } |
@@ -1359,7 +1359,7 @@ discard block |
||
| 1359 | 1359 | ) { |
| 1360 | 1360 | DB::queryFirstRow( |
| 1361 | 1361 | 'SELECT * |
| 1362 | - FROM ' . prefixTable('templates') . ' |
|
| 1362 | + FROM ' . prefixTable('templates').' |
|
| 1363 | 1363 | WHERE item_id = %i', |
| 1364 | 1364 | $post_item_id |
| 1365 | 1365 | ); |
@@ -1402,7 +1402,7 @@ discard block |
||
| 1402 | 1402 | // check if elem exists in Table. If not add it or update it. |
| 1403 | 1403 | DB::query( |
| 1404 | 1404 | 'SELECT * |
| 1405 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 1405 | + FROM ' . prefixTable('automatic_del').' |
|
| 1406 | 1406 | WHERE item_id = %i', |
| 1407 | 1407 | $post_item_id |
| 1408 | 1408 | ); |
@@ -1429,7 +1429,7 @@ discard block |
||
| 1429 | 1429 | // Store updates performed |
| 1430 | 1430 | array_push( |
| 1431 | 1431 | $arrayOfChanges, |
| 1432 | - langHdl('automatic_deletion_engaged') . ': ' . langHdl('enabled') |
|
| 1432 | + langHdl('automatic_deletion_engaged').': '.langHdl('enabled') |
|
| 1433 | 1433 | ); |
| 1434 | 1434 | |
| 1435 | 1435 | // update LOG |
@@ -1472,7 +1472,7 @@ discard block |
||
| 1472 | 1472 | // Store updates performed |
| 1473 | 1473 | array_push( |
| 1474 | 1474 | $arrayOfChanges, |
| 1475 | - langHdl('automatic_deletion_engaged') . ': ' . langHdl('disabled') |
|
| 1475 | + langHdl('automatic_deletion_engaged').': '.langHdl('disabled') |
|
| 1476 | 1476 | ); |
| 1477 | 1477 | |
| 1478 | 1478 | // update LOG |
@@ -1505,7 +1505,7 @@ discard block |
||
| 1505 | 1505 | if (empty($userId) === false) { |
| 1506 | 1506 | $dataTmp = DB::queryfirstrow( |
| 1507 | 1507 | 'SELECT id, name, lastname |
| 1508 | - FROM ' . prefixTable('users') . ' |
|
| 1508 | + FROM ' . prefixTable('users').' |
|
| 1509 | 1509 | WHERE id= %i', |
| 1510 | 1510 | $userId |
| 1511 | 1511 | ); |
@@ -1513,7 +1513,7 @@ discard block |
||
| 1513 | 1513 | // Add to array |
| 1514 | 1514 | array_push( |
| 1515 | 1515 | $arrayOfUsersRestriction, |
| 1516 | - $dataTmp['name'] . ' ' . $dataTmp['lastname'] |
|
| 1516 | + $dataTmp['name'].' '.$dataTmp['lastname'] |
|
| 1517 | 1517 | ); |
| 1518 | 1518 | array_push( |
| 1519 | 1519 | $arrayOfUsersIdRestriction, |
@@ -1544,8 +1544,8 @@ discard block |
||
| 1544 | 1544 | // get values before deleting them |
| 1545 | 1545 | $rows = DB::query( |
| 1546 | 1546 | 'SELECT t.title, t.id AS id |
| 1547 | - FROM ' . prefixTable('roles_title') . ' as t |
|
| 1548 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id) |
|
| 1547 | + FROM ' . prefixTable('roles_title').' as t |
|
| 1548 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id) |
|
| 1549 | 1549 | WHERE r.item_id = %i |
| 1550 | 1550 | ORDER BY t.title ASC', |
| 1551 | 1551 | $post_item_id |
@@ -1579,7 +1579,7 @@ discard block |
||
| 1579 | 1579 | ); |
| 1580 | 1580 | $dataTmp = DB::queryfirstrow( |
| 1581 | 1581 | 'SELECT title |
| 1582 | - FROM ' . prefixTable('roles_title') . ' |
|
| 1582 | + FROM ' . prefixTable('roles_title').' |
|
| 1583 | 1583 | WHERE id = %i', |
| 1584 | 1584 | $role |
| 1585 | 1585 | ); |
@@ -1620,8 +1620,8 @@ discard block |
||
| 1620 | 1620 | $_SESSION['user_id'], |
| 1621 | 1621 | 'at_modification', |
| 1622 | 1622 | $_SESSION['login'], |
| 1623 | - 'at_restriction : ' . (count($diffUsersRestiction) > 0 ? |
|
| 1624 | - implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1623 | + 'at_restriction : '.(count($diffUsersRestiction) > 0 ? |
|
| 1624 | + implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1625 | 1625 | ); |
| 1626 | 1626 | } |
| 1627 | 1627 | |
@@ -1641,7 +1641,7 @@ discard block |
||
| 1641 | 1641 | $_SESSION['user_id'], |
| 1642 | 1642 | 'at_modification', |
| 1643 | 1643 | $_SESSION['login'], |
| 1644 | - 'at_label : ' . $data['label'] . ' => ' . $post_label |
|
| 1644 | + 'at_label : '.$data['label'].' => '.$post_label |
|
| 1645 | 1645 | ); |
| 1646 | 1646 | } |
| 1647 | 1647 | // LOGIN |
@@ -1660,7 +1660,7 @@ discard block |
||
| 1660 | 1660 | $_SESSION['user_id'], |
| 1661 | 1661 | 'at_modification', |
| 1662 | 1662 | $_SESSION['login'], |
| 1663 | - 'at_login : ' . $data['login'] . ' => ' . $post_login |
|
| 1663 | + 'at_login : '.$data['login'].' => '.$post_login |
|
| 1664 | 1664 | ); |
| 1665 | 1665 | } |
| 1666 | 1666 | |
@@ -1679,7 +1679,7 @@ discard block |
||
| 1679 | 1679 | $_SESSION['user_id'], |
| 1680 | 1680 | 'at_modification', |
| 1681 | 1681 | $_SESSION['login'], |
| 1682 | - 'at_email : ' . $data['email'] . ' => ' . $post_email |
|
| 1682 | + 'at_email : '.$data['email'].' => '.$post_email |
|
| 1683 | 1683 | ); |
| 1684 | 1684 | } |
| 1685 | 1685 | // URL |
@@ -1698,7 +1698,7 @@ discard block |
||
| 1698 | 1698 | $_SESSION['user_id'], |
| 1699 | 1699 | 'at_modification', |
| 1700 | 1700 | $_SESSION['login'], |
| 1701 | - 'at_url : ' . $data['url'] . ' => ' . $post_url |
|
| 1701 | + 'at_url : '.$data['url'].' => '.$post_url |
|
| 1702 | 1702 | ); |
| 1703 | 1703 | } |
| 1704 | 1704 | // DESCRIPTION |
@@ -1723,7 +1723,7 @@ discard block |
||
| 1723 | 1723 | // FOLDER |
| 1724 | 1724 | if ($data['id_tree'] !== $post_folder_id) { |
| 1725 | 1725 | // Get name of folders |
| 1726 | - $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $post_folder_id)); |
|
| 1726 | + $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $post_folder_id)); |
|
| 1727 | 1727 | |
| 1728 | 1728 | // Store updates performed |
| 1729 | 1729 | array_push( |
@@ -1739,7 +1739,7 @@ discard block |
||
| 1739 | 1739 | $_SESSION['user_id'], |
| 1740 | 1740 | 'at_modification', |
| 1741 | 1741 | $_SESSION['login'], |
| 1742 | - 'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title'] |
|
| 1742 | + 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title'] |
|
| 1743 | 1743 | ); |
| 1744 | 1744 | // ask for page reloading |
| 1745 | 1745 | $reloadPage = true; |
@@ -1749,7 +1749,7 @@ discard block |
||
| 1749 | 1749 | // Store updates performed |
| 1750 | 1750 | array_push( |
| 1751 | 1751 | $arrayOfChanges, |
| 1752 | - langHdl('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? langHdl('disabled') : langHdl('enabled')) |
|
| 1752 | + langHdl('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? langHdl('disabled') : langHdl('enabled')) |
|
| 1753 | 1753 | ); |
| 1754 | 1754 | |
| 1755 | 1755 | // Log |
@@ -1760,15 +1760,15 @@ discard block |
||
| 1760 | 1760 | $_SESSION['user_id'], |
| 1761 | 1761 | 'at_modification', |
| 1762 | 1762 | $_SESSION['login'], |
| 1763 | - 'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 1763 | + 'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 1764 | 1764 | ); |
| 1765 | 1765 | } |
| 1766 | 1766 | |
| 1767 | 1767 | // Reload new values |
| 1768 | 1768 | $dataItem = DB::queryfirstrow( |
| 1769 | 1769 | 'SELECT * |
| 1770 | - FROM ' . prefixTable('items') . ' as i |
|
| 1771 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 1770 | + FROM ' . prefixTable('items').' as i |
|
| 1771 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 1772 | 1772 | WHERE i.id = %i AND l.action = %s', |
| 1773 | 1773 | $post_item_id, |
| 1774 | 1774 | 'at_creation' |
@@ -1777,8 +1777,8 @@ discard block |
||
| 1777 | 1777 | $history = ''; |
| 1778 | 1778 | $rows = DB::query( |
| 1779 | 1779 | 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login |
| 1780 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 1781 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 1780 | + FROM ' . prefixTable('log_items').' as l |
|
| 1781 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 1782 | 1782 | WHERE l.action <> %s AND id_item=%s', |
| 1783 | 1783 | 'at_shown', |
| 1784 | 1784 | $post_item_id |
@@ -1786,14 +1786,14 @@ discard block |
||
| 1786 | 1786 | foreach ($rows as $record) { |
| 1787 | 1787 | $reason = explode(':', $record['raison']); |
| 1788 | 1788 | if (count($reason) > 0) { |
| 1789 | - $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $record['date']) . ' - ' |
|
| 1790 | - . $record['login'] . ' - ' . langHdl($record['action']) . ' - ' |
|
| 1791 | - . (empty($record['raison']) === false ? (count($reason) > 1 ? langHdl(trim($reason[0])) . ' : ' . $reason[1] |
|
| 1789 | + $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $record['date']).' - ' |
|
| 1790 | + . $record['login'].' - '.langHdl($record['action']).' - ' |
|
| 1791 | + . (empty($record['raison']) === false ? (count($reason) > 1 ? langHdl(trim($reason[0])).' : '.$reason[1] |
|
| 1792 | 1792 | : langHdl(trim($reason[0]))) : ''); |
| 1793 | 1793 | if (empty($history)) { |
| 1794 | 1794 | $history = $sentence; |
| 1795 | 1795 | } else { |
| 1796 | - $history .= '<br />' . $sentence; |
|
| 1796 | + $history .= '<br />'.$sentence; |
|
| 1797 | 1797 | } |
| 1798 | 1798 | } |
| 1799 | 1799 | } |
@@ -1804,19 +1804,19 @@ discard block |
||
| 1804 | 1804 | // Prepare files listing |
| 1805 | 1805 | $files = $filesEdit = ''; |
| 1806 | 1806 | // launch query |
| 1807 | - $rows = DB::query('SELECT id, name, file, extension FROM ' . prefixTable('files') . ' WHERE id_item=%i', $post_item_id); |
|
| 1807 | + $rows = DB::query('SELECT id, name, file, extension FROM '.prefixTable('files').' WHERE id_item=%i', $post_item_id); |
|
| 1808 | 1808 | foreach ($rows as $record) { |
| 1809 | 1809 | // get icon image depending on file format |
| 1810 | 1810 | $iconImage = fileFormatImage($record['extension']); |
| 1811 | 1811 | |
| 1812 | 1812 | // If file is an image, then prepare lightbox. If not image, then prepare donwload |
| 1813 | 1813 | if (in_array($record['extension'], TP_IMAGE_FILE_EXT)) { |
| 1814 | - $files .= '<i class=\'fa fa-file-image-o\' /></i> <a class="image_dialog" href="#' . $record['id'] . '" title="' . $record['name'] . '">' . $record['name'] . '</a><br />'; |
|
| 1814 | + $files .= '<i class=\'fa fa-file-image-o\' /></i> <a class="image_dialog" href="#'.$record['id'].'" title="'.$record['name'].'">'.$record['name'].'</a><br />'; |
|
| 1815 | 1815 | } else { |
| 1816 | - $files .= '<i class=\'fa fa-file-text-o\' /></i> <a href=\'sources/downloadFile.php?name=' . urlencode($record['name']) . '&type=sub&key=' . $_SESSION['key'] . '&key_tmp=' . $_SESSION['key_tmp'] . '&fileid=' . $record['id'] . '\' target=\'_blank\'>' . $record['name'] . '</a><br />'; |
|
| 1816 | + $files .= '<i class=\'fa fa-file-text-o\' /></i> <a href=\'sources/downloadFile.php?name='.urlencode($record['name']).'&type=sub&key='.$_SESSION['key'].'&key_tmp='.$_SESSION['key_tmp'].'&fileid='.$record['id'].'\' target=\'_blank\'>'.$record['name'].'</a><br />'; |
|
| 1817 | 1817 | } |
| 1818 | 1818 | // Prepare list of files for edit dialogbox |
| 1819 | - $filesEdit .= '<span id="span_edit_file_' . $record['id'] . '"><span class="fa fa-' . $iconImage . '"></span> <span class="fa fa-eraser tip" style="cursor:pointer;" onclick="delete_attached_file(\"' . $record['id'] . '\")" title="' . langHdl('at_delete') . '"></span> ' . $record['name'] . '</span><br />'; |
|
| 1819 | + $filesEdit .= '<span id="span_edit_file_'.$record['id'].'"><span class="fa fa-'.$iconImage.'"></span> <span class="fa fa-eraser tip" style="cursor:pointer;" onclick="delete_attached_file(\"'.$record['id'].'\")" title="'.langHdl('at_delete').'"></span> '.$record['name'].'</span><br />'; |
|
| 1820 | 1820 | } |
| 1821 | 1821 | // Send email |
| 1822 | 1822 | if (is_array($post_diffusion_list) === true && count($post_diffusion_list) > 0) { |
@@ -1932,7 +1932,7 @@ discard block |
||
| 1932 | 1932 | ) { |
| 1933 | 1933 | // load the original record into an array |
| 1934 | 1934 | $originalRecord = DB::queryfirstrow( |
| 1935 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 1935 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 1936 | 1936 | WHERE id = %i', |
| 1937 | 1937 | $post_item_id |
| 1938 | 1938 | ); |
@@ -1951,7 +1951,7 @@ discard block |
||
| 1951 | 1951 | |
| 1952 | 1952 | // Load the destination folder record into an array |
| 1953 | 1953 | $dataDestination = DB::queryfirstrow( |
| 1954 | - 'SELECT personal_folder FROM ' . prefixTable('nested_tree') . ' |
|
| 1954 | + 'SELECT personal_folder FROM '.prefixTable('nested_tree').' |
|
| 1955 | 1955 | WHERE id = %i', |
| 1956 | 1956 | $post_dest_id |
| 1957 | 1957 | ); |
@@ -1959,7 +1959,7 @@ discard block |
||
| 1959 | 1959 | // Get the ITEM object key for the user |
| 1960 | 1960 | $userKey = DB::queryFirstRow( |
| 1961 | 1961 | 'SELECT share_key |
| 1962 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1962 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1963 | 1963 | WHERE user_id = %i AND object_id = %i', |
| 1964 | 1964 | $_SESSION['user_id'], |
| 1965 | 1965 | $post_item_id |
@@ -2031,7 +2031,7 @@ discard block |
||
| 2031 | 2031 | // Manage Custom Fields |
| 2032 | 2032 | $rows = DB::query( |
| 2033 | 2033 | 'SELECT * |
| 2034 | - FROM ' . prefixTable('categories_items') . ' |
|
| 2034 | + FROM ' . prefixTable('categories_items').' |
|
| 2035 | 2035 | WHERE item_id = %i', |
| 2036 | 2036 | $post_item_id |
| 2037 | 2037 | ); |
@@ -2079,15 +2079,15 @@ discard block |
||
| 2079 | 2079 | $rows = DB::query( |
| 2080 | 2080 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
| 2081 | 2081 | f.size AS size, f.type AS type, s.share_key AS share_key |
| 2082 | - FROM ' . prefixTable('files') . ' AS f |
|
| 2083 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 2082 | + FROM ' . prefixTable('files').' AS f |
|
| 2083 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 2084 | 2084 | WHERE s.user_id = %i AND f.id_item = %i', |
| 2085 | 2085 | $_SESSION['user_id'], |
| 2086 | 2086 | $post_item_id |
| 2087 | 2087 | ); |
| 2088 | 2088 | foreach ($rows as $record) { |
| 2089 | 2089 | // Check if file still exists |
| 2090 | - if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) { |
|
| 2090 | + if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) { |
|
| 2091 | 2091 | // Step1 - decrypt the file |
| 2092 | 2092 | $fileContent = decryptFile( |
| 2093 | 2093 | $record['file'], |
@@ -2096,8 +2096,8 @@ discard block |
||
| 2096 | 2096 | ); |
| 2097 | 2097 | |
| 2098 | 2098 | // Step2 - create file |
| 2099 | - $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension']; |
|
| 2100 | - $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab'); |
|
| 2099 | + $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension']; |
|
| 2100 | + $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab'); |
|
| 2101 | 2101 | if ($outstream === false) { |
| 2102 | 2102 | echo prepareExchangedData( |
| 2103 | 2103 | array( |
@@ -2147,7 +2147,7 @@ discard block |
||
| 2147 | 2147 | |
| 2148 | 2148 | // ------------------------- |
| 2149 | 2149 | // Add specific restrictions |
| 2150 | - $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $post_item_id); |
|
| 2150 | + $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $post_item_id); |
|
| 2151 | 2151 | foreach ($rows as $record) { |
| 2152 | 2152 | DB::insert( |
| 2153 | 2153 | prefixTable('restriction_to_roles'), |
@@ -2159,7 +2159,7 @@ discard block |
||
| 2159 | 2159 | } |
| 2160 | 2160 | |
| 2161 | 2161 | // Add Tags |
| 2162 | - $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $post_item_id); |
|
| 2162 | + $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $post_item_id); |
|
| 2163 | 2163 | foreach ($rows as $record) { |
| 2164 | 2164 | DB::insert( |
| 2165 | 2165 | prefixTable('tags'), |
@@ -2189,7 +2189,7 @@ discard block |
||
| 2189 | 2189 | $_SESSION['login'] |
| 2190 | 2190 | ); |
| 2191 | 2191 | // reload cache table |
| 2192 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 2192 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 2193 | 2193 | updateCacheTable('reload', $SETTINGS, ''); |
| 2194 | 2194 | |
| 2195 | 2195 | echo (string) prepareExchangedData( |
@@ -2261,7 +2261,7 @@ discard block |
||
| 2261 | 2261 | // then we can show it |
| 2262 | 2262 | $item_deleted = DB::queryFirstRow( |
| 2263 | 2263 | 'SELECT * |
| 2264 | - FROM ' . prefixTable('log_items') . ' |
|
| 2264 | + FROM ' . prefixTable('log_items').' |
|
| 2265 | 2265 | WHERE id_item = %i AND action = %s |
| 2266 | 2266 | ORDER BY date DESC |
| 2267 | 2267 | LIMIT 0, 1', |
@@ -2272,7 +2272,7 @@ discard block |
||
| 2272 | 2272 | |
| 2273 | 2273 | $item_restored = DB::queryFirstRow( |
| 2274 | 2274 | 'SELECT * |
| 2275 | - FROM ' . prefixTable('log_items') . ' |
|
| 2275 | + FROM ' . prefixTable('log_items').' |
|
| 2276 | 2276 | WHERE id_item = %i AND action = %s |
| 2277 | 2277 | ORDER BY date DESC |
| 2278 | 2278 | LIMIT 0, 1', |
@@ -2296,8 +2296,8 @@ discard block |
||
| 2296 | 2296 | // Get all informations for this item |
| 2297 | 2297 | $dataItem = DB::queryfirstrow( |
| 2298 | 2298 | 'SELECT * |
| 2299 | - FROM ' . prefixTable('items') . ' as i |
|
| 2300 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2299 | + FROM ' . prefixTable('items').' as i |
|
| 2300 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2301 | 2301 | WHERE i.id = %i AND l.action = %s', |
| 2302 | 2302 | $post_id, |
| 2303 | 2303 | 'at_creation' |
@@ -2306,7 +2306,7 @@ discard block |
||
| 2306 | 2306 | // Notification |
| 2307 | 2307 | DB::queryfirstrow( |
| 2308 | 2308 | 'SELECT * |
| 2309 | - FROM ' . prefixTable('notification') . ' |
|
| 2309 | + FROM ' . prefixTable('notification').' |
|
| 2310 | 2310 | WHERE item_id = %i AND user_id = %i', |
| 2311 | 2311 | $post_id, |
| 2312 | 2312 | $_SESSION['user_id'] |
@@ -2353,13 +2353,13 @@ discard block |
||
| 2353 | 2353 | && (int) $SETTINGS['enable_email_notification_on_item_shown'] === 1 |
| 2354 | 2354 | && (int) $user['admin'] === 1 |
| 2355 | 2355 | ) { |
| 2356 | - $_SESSION['listNotificationEmails'] .= $user['email'] . ','; |
|
| 2356 | + $_SESSION['listNotificationEmails'] .= $user['email'].','; |
|
| 2357 | 2357 | } |
| 2358 | 2358 | } |
| 2359 | 2359 | |
| 2360 | 2360 | // manage case of API user |
| 2361 | 2361 | if ($dataItem['id_user'] === API_USER_ID) { |
| 2362 | - $arrData['author'] = 'API [' . $dataItem['description'] . ']'; |
|
| 2362 | + $arrData['author'] = 'API ['.$dataItem['description'].']'; |
|
| 2363 | 2363 | $arrData['id_user'] = API_USER_ID; |
| 2364 | 2364 | $arrData['author_email'] = ''; |
| 2365 | 2365 | $arrData['notification_status'] = false; |
@@ -2369,7 +2369,7 @@ discard block |
||
| 2369 | 2369 | $tags = array(); |
| 2370 | 2370 | $rows = DB::query( |
| 2371 | 2371 | 'SELECT tag |
| 2372 | - FROM ' . prefixTable('tags') . ' |
|
| 2372 | + FROM ' . prefixTable('tags').' |
|
| 2373 | 2373 | WHERE item_id = %i', |
| 2374 | 2374 | $post_id |
| 2375 | 2375 | ); |
@@ -2394,7 +2394,7 @@ discard block |
||
| 2394 | 2394 | // Check if user has a role that is accepted |
| 2395 | 2395 | $rows_tmp = DB::query( |
| 2396 | 2396 | 'SELECT role_id |
| 2397 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 2397 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 2398 | 2398 | WHERE item_id=%i', |
| 2399 | 2399 | $post_id |
| 2400 | 2400 | ); |
@@ -2408,7 +2408,7 @@ discard block |
||
| 2408 | 2408 | // Get the object key for the user |
| 2409 | 2409 | $userKey = DB::queryFirstRow( |
| 2410 | 2410 | 'SELECT share_key |
| 2411 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2411 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2412 | 2412 | WHERE user_id = %i AND object_id = %i', |
| 2413 | 2413 | $_SESSION['user_id'], |
| 2414 | 2414 | $post_id |
@@ -2493,8 +2493,8 @@ discard block |
||
| 2493 | 2493 | // Add restriction if item is restricted to roles |
| 2494 | 2494 | $rows = DB::query( |
| 2495 | 2495 | 'SELECT t.title, t.id |
| 2496 | - FROM ' . prefixTable('roles_title') . ' AS t |
|
| 2497 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id) |
|
| 2496 | + FROM ' . prefixTable('roles_title').' AS t |
|
| 2497 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id) |
|
| 2498 | 2498 | WHERE r.item_id = %i |
| 2499 | 2499 | ORDER BY t.title ASC', |
| 2500 | 2500 | $post_id |
@@ -2510,8 +2510,8 @@ discard block |
||
| 2510 | 2510 | $tmp = array(); |
| 2511 | 2511 | $rows = DB::query( |
| 2512 | 2512 | 'SELECT k.label, k.id |
| 2513 | - FROM ' . prefixTable('kb_items') . ' as i |
|
| 2514 | - INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id) |
|
| 2513 | + FROM ' . prefixTable('kb_items').' as i |
|
| 2514 | + INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id) |
|
| 2515 | 2515 | WHERE i.item_id = %i |
| 2516 | 2516 | ORDER BY k.label ASC', |
| 2517 | 2517 | $post_id |
@@ -2591,7 +2591,7 @@ discard block |
||
| 2591 | 2591 | $arrCatList = array(); |
| 2592 | 2592 | $rows_tmp = DB::query( |
| 2593 | 2593 | 'SELECT id_category |
| 2594 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 2594 | + FROM ' . prefixTable('categories_folders').' |
|
| 2595 | 2595 | WHERE id_folder=%i', |
| 2596 | 2596 | $post_folder_id |
| 2597 | 2597 | ); |
@@ -2606,8 +2606,8 @@ discard block |
||
| 2606 | 2606 | 'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id, |
| 2607 | 2607 | i.encryption_type AS encryption_type, c.encrypted_data, c.parent_id AS parent_id, |
| 2608 | 2608 | c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility |
| 2609 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 2610 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 2609 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 2610 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 2611 | 2611 | WHERE i.item_id=%i AND c.parent_id IN %ls', |
| 2612 | 2612 | $post_id, |
| 2613 | 2613 | $arrCatList |
@@ -2618,11 +2618,11 @@ discard block |
||
| 2618 | 2618 | //db::debugmode(true); |
| 2619 | 2619 | $userKey = DB::queryFirstRow( |
| 2620 | 2620 | 'SELECT share_key |
| 2621 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2621 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2622 | 2622 | WHERE user_id = %i AND object_id = %i', |
| 2623 | 2623 | $_SESSION['user_id'], |
| 2624 | 2624 | $row['id'] |
| 2625 | - );//db::debugmode(false); |
|
| 2625 | + ); //db::debugmode(false); |
|
| 2626 | 2626 | if (DB::count() === 0) { |
| 2627 | 2627 | // Not encrypted |
| 2628 | 2628 | $fieldText['string'] = $row['data']; |
@@ -2663,7 +2663,7 @@ discard block |
||
| 2663 | 2663 | if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) { |
| 2664 | 2664 | $rows_tmp = DB::queryfirstrow( |
| 2665 | 2665 | 'SELECT category_id |
| 2666 | - FROM ' . prefixTable('templates') . ' |
|
| 2666 | + FROM ' . prefixTable('templates').' |
|
| 2667 | 2667 | WHERE item_id = %i', |
| 2668 | 2668 | $post_id |
| 2669 | 2669 | ); |
@@ -2688,7 +2688,7 @@ discard block |
||
| 2688 | 2688 | // Is the Item to be deleted? |
| 2689 | 2689 | $dataDelete = DB::queryfirstrow( |
| 2690 | 2690 | 'SELECT * |
| 2691 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 2691 | + FROM ' . prefixTable('automatic_del').' |
|
| 2692 | 2692 | WHERE item_id = %i', |
| 2693 | 2693 | $post_id |
| 2694 | 2694 | ); |
@@ -2770,11 +2770,11 @@ discard block |
||
| 2770 | 2770 | if (empty($dataItem['restricted_to']) === false) { |
| 2771 | 2771 | foreach (explode(';', $dataItem['restricted_to']) as $userRest) { |
| 2772 | 2772 | if (empty($userRest) === false) { |
| 2773 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
| 2773 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
| 2774 | 2774 | if (empty($listOfRestricted)) { |
| 2775 | 2775 | $listOfRestricted = $dataTmp['login']; |
| 2776 | 2776 | } else { |
| 2777 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 2777 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 2778 | 2778 | } |
| 2779 | 2779 | } |
| 2780 | 2780 | } |
@@ -2831,8 +2831,8 @@ discard block |
||
| 2831 | 2831 | // Load item data |
| 2832 | 2832 | $dataItem = DB::queryFirstRow( |
| 2833 | 2833 | 'SELECT i.*, n.title AS folder_title |
| 2834 | - FROM ' . prefixTable('items') . ' AS i |
|
| 2835 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 2834 | + FROM ' . prefixTable('items').' AS i |
|
| 2835 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 2836 | 2836 | WHERE i.id = %i', |
| 2837 | 2837 | $post_id |
| 2838 | 2838 | ); |
@@ -2854,7 +2854,7 @@ discard block |
||
| 2854 | 2854 | // Check if user has a role that is accepted |
| 2855 | 2855 | $rows_tmp = DB::query( |
| 2856 | 2856 | 'SELECT role_id |
| 2857 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 2857 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 2858 | 2858 | WHERE item_id=%i', |
| 2859 | 2859 | $post_id |
| 2860 | 2860 | ); |
@@ -2900,7 +2900,7 @@ discard block |
||
| 2900 | 2900 | // launch query |
| 2901 | 2901 | $rows = DB::query( |
| 2902 | 2902 | 'SELECT id, name, file, extension, size |
| 2903 | - FROM ' . prefixTable('files') . ' |
|
| 2903 | + FROM ' . prefixTable('files').' |
|
| 2904 | 2904 | WHERE id_item = %i AND confirmed = 1', |
| 2905 | 2905 | $post_id |
| 2906 | 2906 | ); |
@@ -2909,7 +2909,7 @@ discard block |
||
| 2909 | 2909 | $attachments, |
| 2910 | 2910 | array( |
| 2911 | 2911 | 'icon' => fileFormatImage(strtolower($record['extension'])), |
| 2912 | - 'filename' => basename($record['name'], '.' . $record['extension']), |
|
| 2912 | + 'filename' => basename($record['name'], '.'.$record['extension']), |
|
| 2913 | 2913 | 'extension' => $record['extension'], |
| 2914 | 2914 | 'size' => formatSizeUnits($record['size']), |
| 2915 | 2915 | 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, |
@@ -2938,7 +2938,7 @@ discard block |
||
| 2938 | 2938 | array( |
| 2939 | 2939 | 'latest_items' => implode(';', $_SESSION['latest_items']), |
| 2940 | 2940 | ), |
| 2941 | - 'id=' . $_SESSION['user_id'] |
|
| 2941 | + 'id='.$_SESSION['user_id'] |
|
| 2942 | 2942 | ); |
| 2943 | 2943 | } |
| 2944 | 2944 | |
@@ -2947,8 +2947,8 @@ discard block |
||
| 2947 | 2947 | $listOptionsForRoles = array(); |
| 2948 | 2948 | $rows = DB::query( |
| 2949 | 2949 | 'SELECT r.role_id AS role_id, t.title AS title |
| 2950 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 2951 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 2950 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 2951 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 2952 | 2952 | WHERE r.folder_id = %i', |
| 2953 | 2953 | $dataItem['id_tree'] |
| 2954 | 2954 | ); |
@@ -2962,9 +2962,9 @@ discard block |
||
| 2962 | 2962 | ); |
| 2963 | 2963 | $rows2 = DB::query( |
| 2964 | 2964 | 'SELECT id, login, fonction_id, email, name, lastname |
| 2965 | - FROM ' . prefixTable('users') . ' |
|
| 2965 | + FROM ' . prefixTable('users').' |
|
| 2966 | 2966 | WHERE fonction_id LIKE %s', |
| 2967 | - '%' . $record['role_id'] . '%' |
|
| 2967 | + '%'.$record['role_id'].'%' |
|
| 2968 | 2968 | ); |
| 2969 | 2969 | foreach ($rows2 as $record2) { |
| 2970 | 2970 | foreach (explode(';', $record2['fonction_id']) as $role) { |
@@ -2977,7 +2977,7 @@ discard block |
||
| 2977 | 2977 | array( |
| 2978 | 2978 | 'id' => (int) $record2['id'], |
| 2979 | 2979 | 'login' => $record2['login'], |
| 2980 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 2980 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 2981 | 2981 | 'email' => $record2['email'], |
| 2982 | 2982 | ) |
| 2983 | 2983 | ); |
@@ -2996,16 +2996,16 @@ discard block |
||
| 2996 | 2996 | $path = ''; |
| 2997 | 2997 | foreach ($arbo as $elem) { |
| 2998 | 2998 | if (empty($path) === true) { |
| 2999 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 2999 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 3000 | 3000 | } else { |
| 3001 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3001 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3002 | 3002 | } |
| 3003 | 3003 | } |
| 3004 | 3004 | // Build text to show user |
| 3005 | 3005 | if (empty($path) === true) { |
| 3006 | 3006 | $path = addslashes($dataItem['label']); |
| 3007 | 3007 | } else { |
| 3008 | - $path = addslashes($dataItem['label']) . ' (' . $path . ')'; |
|
| 3008 | + $path = addslashes($dataItem['label']).' ('.$path.')'; |
|
| 3009 | 3009 | } |
| 3010 | 3010 | |
| 3011 | 3011 | // send back infos |
@@ -3019,7 +3019,7 @@ discard block |
||
| 3019 | 3019 | array( |
| 3020 | 3020 | addslashes($_SESSION['login']), |
| 3021 | 3021 | $path, |
| 3022 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'], |
|
| 3022 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'], |
|
| 3023 | 3023 | ), |
| 3024 | 3024 | langHdl('email_on_open_notification_mail') |
| 3025 | 3025 | ), |
@@ -3030,7 +3030,7 @@ discard block |
||
| 3030 | 3030 | } |
| 3031 | 3031 | |
| 3032 | 3032 | // has this item a change proposal |
| 3033 | - DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $post_id); |
|
| 3033 | + DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $post_id); |
|
| 3034 | 3034 | $returnArray['has_change_proposal'] = DB::count(); |
| 3035 | 3035 | |
| 3036 | 3036 | // Setting |
@@ -3121,7 +3121,7 @@ discard block |
||
| 3121 | 3121 | // Load item data |
| 3122 | 3122 | $data = DB::queryFirstRow( |
| 3123 | 3123 | 'SELECT id_tree |
| 3124 | - FROM ' . prefixTable('items') . ' |
|
| 3124 | + FROM ' . prefixTable('items').' |
|
| 3125 | 3125 | WHERE id = %i', |
| 3126 | 3126 | $post_item_id |
| 3127 | 3127 | ); |
@@ -3191,13 +3191,13 @@ discard block |
||
| 3191 | 3191 | |
| 3192 | 3192 | // Check if user is allowed to access this folder |
| 3193 | 3193 | if (!in_array($post_folder_id, $_SESSION['groupes_visibles'])) { |
| 3194 | - echo '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3194 | + echo '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3195 | 3195 | break; |
| 3196 | 3196 | } |
| 3197 | 3197 | |
| 3198 | 3198 | // Check if title doesn't contains html codes |
| 3199 | 3199 | if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) { |
| 3200 | - echo '[ { "error" : "' . langHdl('error_html_codes') . '" } ]'; |
|
| 3200 | + echo '[ { "error" : "'.langHdl('error_html_codes').'" } ]'; |
|
| 3201 | 3201 | break; |
| 3202 | 3202 | } |
| 3203 | 3203 | // check that title is not numeric |
@@ -3209,9 +3209,9 @@ discard block |
||
| 3209 | 3209 | // Check if duplicate folders name are allowed |
| 3210 | 3210 | $createNewFolder = true; |
| 3211 | 3211 | if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') { |
| 3212 | - $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title); |
|
| 3212 | + $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title); |
|
| 3213 | 3213 | if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) { |
| 3214 | - echo '[ { "error" : "' . langHdl('error_group_exist') . '" } ]'; |
|
| 3214 | + echo '[ { "error" : "'.langHdl('error_group_exist').'" } ]'; |
|
| 3215 | 3215 | break; |
| 3216 | 3216 | } |
| 3217 | 3217 | } |
@@ -3219,7 +3219,7 @@ discard block |
||
| 3219 | 3219 | // query on folder |
| 3220 | 3220 | $data = DB::queryfirstrow( |
| 3221 | 3221 | 'SELECT parent_id, personal_folder |
| 3222 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3222 | + FROM ' . prefixTable('nested_tree').' |
|
| 3223 | 3223 | WHERE id = %i', |
| 3224 | 3224 | $post_folder_id |
| 3225 | 3225 | ); |
@@ -3229,20 +3229,20 @@ discard block |
||
| 3229 | 3229 | if ($_SESSION['is_admin'] !== 1 && $_SESSION['user_manager'] !== 1 && $data['personal_folder'] === '0') { |
| 3230 | 3230 | $data = DB::queryfirstrow( |
| 3231 | 3231 | 'SELECT valeur |
| 3232 | - FROM ' . prefixTable('misc') . ' |
|
| 3232 | + FROM ' . prefixTable('misc').' |
|
| 3233 | 3233 | WHERE intitule = %i AND type = %s', |
| 3234 | 3234 | $data['parent_id'], |
| 3235 | 3235 | 'complex' |
| 3236 | 3236 | ); |
| 3237 | 3237 | if (intval($dataReceived['complexity']) < intval($data['valeur'])) { |
| 3238 | - echo '[ { "error" : "' . langHdl('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]'; |
|
| 3238 | + echo '[ { "error" : "'.langHdl('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]'; |
|
| 3239 | 3239 | break; |
| 3240 | 3240 | } |
| 3241 | 3241 | } |
| 3242 | 3242 | |
| 3243 | 3243 | // update Folders table |
| 3244 | 3244 | $tmp = DB::queryFirstRow( |
| 3245 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 3245 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 3246 | 3246 | $dataReceived['folder'] |
| 3247 | 3247 | ); |
| 3248 | 3248 | if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $_SESSION['user_id'] || $tmp['personal_folder'] !== 1) { |
@@ -3307,42 +3307,42 @@ discard block |
||
| 3307 | 3307 | in_array($post_target_folder_id, $_SESSION['groupes_visibles']) === false) && ($post_target_folder_id === '0' && |
| 3308 | 3308 | isset($SETTINGS['can_create_root_folder']) === true && (int) $SETTINGS['can_create_root_folder'] === 1) |
| 3309 | 3309 | ) { |
| 3310 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3310 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3311 | 3311 | echo $returnValues; |
| 3312 | 3312 | break; |
| 3313 | 3313 | } |
| 3314 | 3314 | |
| 3315 | 3315 | $tmp_source = DB::queryFirstRow( |
| 3316 | 3316 | 'SELECT title, parent_id, personal_folder |
| 3317 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3317 | + FROM ' . prefixTable('nested_tree').' |
|
| 3318 | 3318 | WHERE id = %i', |
| 3319 | 3319 | $post_source_folder_id |
| 3320 | 3320 | ); |
| 3321 | 3321 | |
| 3322 | 3322 | $tmp_target = DB::queryFirstRow( |
| 3323 | 3323 | 'SELECT title, parent_id, personal_folder |
| 3324 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3324 | + FROM ' . prefixTable('nested_tree').' |
|
| 3325 | 3325 | WHERE id = %i', |
| 3326 | 3326 | $post_target_folder_id |
| 3327 | 3327 | ); |
| 3328 | 3328 | |
| 3329 | 3329 | // check if target is not a child of source |
| 3330 | 3330 | if ($tree->isChildOf($post_target_folder_id, $post_source_folder_id) === true) { |
| 3331 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3331 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3332 | 3332 | echo $returnValues; |
| 3333 | 3333 | break; |
| 3334 | 3334 | } |
| 3335 | 3335 | |
| 3336 | 3336 | // check if source or target folder is PF. If Yes, then cancel operation |
| 3337 | 3337 | if ((int) $tmp_source['personal_folder'] === 1 || (int) $tmp_target['personal_folder'] === 1) { |
| 3338 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3338 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3339 | 3339 | echo $returnValues; |
| 3340 | 3340 | break; |
| 3341 | 3341 | } |
| 3342 | 3342 | |
| 3343 | 3343 | // check if source or target folder is PF. If Yes, then cancel operation |
| 3344 | 3344 | if ($tmp_source['title'] === $_SESSION['user_id'] || $tmp_target['title'] === $_SESSION['user_id']) { |
| 3345 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3345 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3346 | 3346 | echo $returnValues; |
| 3347 | 3347 | break; |
| 3348 | 3348 | } |
@@ -3465,7 +3465,7 @@ discard block |
||
| 3465 | 3465 | foreach ($_SESSION['user_roles'] as $role) { |
| 3466 | 3466 | $roleQ = DB::queryfirstrow( |
| 3467 | 3467 | 'SELECT allow_pw_change |
| 3468 | - FROM ' . prefixTable('roles_title') . ' |
|
| 3468 | + FROM ' . prefixTable('roles_title').' |
|
| 3469 | 3469 | WHERE id = %i', |
| 3470 | 3470 | $role |
| 3471 | 3471 | ); |
@@ -3490,11 +3490,11 @@ discard block |
||
| 3490 | 3490 | |
| 3491 | 3491 | foreach ($_SESSION['user_roles'] as $role) { |
| 3492 | 3492 | $access = DB::queryFirstRow( |
| 3493 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
| 3493 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
| 3494 | 3494 | $role, |
| 3495 | 3495 | $post_id |
| 3496 | 3496 | ); |
| 3497 | - if (DB::count()>0) { |
|
| 3497 | + if (DB::count() > 0) { |
|
| 3498 | 3498 | if ($access['type'] === 'R') { |
| 3499 | 3499 | array_push($arrTmp, 10); |
| 3500 | 3500 | } elseif ($access['type'] === 'W') { |
@@ -3558,7 +3558,7 @@ discard block |
||
| 3558 | 3558 | } else { |
| 3559 | 3559 | DB::query( |
| 3560 | 3560 | 'SELECT * |
| 3561 | - FROM ' . prefixTable('items') . ' |
|
| 3561 | + FROM ' . prefixTable('items').' |
|
| 3562 | 3562 | WHERE inactif = %i', |
| 3563 | 3563 | 0 |
| 3564 | 3564 | ); |
@@ -3569,7 +3569,7 @@ discard block |
||
| 3569 | 3569 | |
| 3570 | 3570 | // Get folder complexity |
| 3571 | 3571 | $folderComplexity = DB::queryFirstRow( |
| 3572 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i', |
|
| 3572 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i', |
|
| 3573 | 3573 | 'complex', |
| 3574 | 3574 | $post_id |
| 3575 | 3575 | ); |
@@ -3581,7 +3581,7 @@ discard block |
||
| 3581 | 3581 | if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) { |
| 3582 | 3582 | $folderRow = DB::query( |
| 3583 | 3583 | 'SELECT id_category |
| 3584 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 3584 | + FROM ' . prefixTable('categories_folders').' |
|
| 3585 | 3585 | WHERE id_folder = %i', |
| 3586 | 3586 | $post_id |
| 3587 | 3587 | ); |
@@ -3698,13 +3698,13 @@ discard block |
||
| 3698 | 3698 | // List all ITEMS |
| 3699 | 3699 | if ($folderIsPf === false) { |
| 3700 | 3700 | $where->add('i.inactif=%i', 0); |
| 3701 | - $where->add('l.date=%l', '(SELECT date FROM ' . prefixTable('log_items') . " WHERE action IN ('at_creation', 'at_modification') AND id_item=i.id ORDER BY date DESC LIMIT 1)"); |
|
| 3701 | + $where->add('l.date=%l', '(SELECT date FROM '.prefixTable('log_items')." WHERE action IN ('at_creation', 'at_modification') AND id_item=i.id ORDER BY date DESC LIMIT 1)"); |
|
| 3702 | 3702 | if (empty($limited_to_items) === false) { |
| 3703 | 3703 | $where->add('i.id IN %ls', explode(',', $limited_to_items)); |
| 3704 | 3704 | } |
| 3705 | 3705 | |
| 3706 | - $query_limit = ' LIMIT ' . |
|
| 3707 | - $start . ',' . |
|
| 3706 | + $query_limit = ' LIMIT '. |
|
| 3707 | + $start.','. |
|
| 3708 | 3708 | $post_nb_items_to_display_once; |
| 3709 | 3709 | //db::debugmode(true); |
| 3710 | 3710 | $rows = DB::query( |
@@ -3715,9 +3715,9 @@ discard block |
||
| 3715 | 3715 | MIN(l.action) AS log_action, |
| 3716 | 3716 | l.id_user AS log_user, |
| 3717 | 3717 | i.url AS link |
| 3718 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3719 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 3720 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 3718 | + FROM ' . prefixTable('items').' AS i |
|
| 3719 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 3720 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 3721 | 3721 | WHERE %l |
| 3722 | 3722 | GROUP BY i.id, l.date, l.id_user, l.action |
| 3723 | 3723 | ORDER BY i.label ASC, l.date DESC' . $query_limit, |
@@ -3736,9 +3736,9 @@ discard block |
||
| 3736 | 3736 | MIN(l.action) AS log_action, |
| 3737 | 3737 | l.id_user AS log_user, |
| 3738 | 3738 | i.url AS link |
| 3739 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3740 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 3741 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 3739 | + FROM ' . prefixTable('items').' AS i |
|
| 3740 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 3741 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 3742 | 3742 | WHERE %l |
| 3743 | 3743 | GROUP BY i.id, l.date, l.id_user, l.action |
| 3744 | 3744 | ORDER BY i.label ASC, l.date DESC', |
@@ -3770,7 +3770,7 @@ discard block |
||
| 3770 | 3770 | $item_is_restricted_to_role = false; |
| 3771 | 3771 | DB::queryfirstrow( |
| 3772 | 3772 | 'SELECT role_id |
| 3773 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 3773 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 3774 | 3774 | WHERE item_id = %i', |
| 3775 | 3775 | $record['id'] |
| 3776 | 3776 | ); |
@@ -3782,7 +3782,7 @@ discard block |
||
| 3782 | 3782 | $user_is_included_in_role = false; |
| 3783 | 3783 | $roles = DB::query( |
| 3784 | 3784 | 'SELECT role_id |
| 3785 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 3785 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 3786 | 3786 | WHERE item_id = %i AND role_id IN %ls', |
| 3787 | 3787 | $record['id'], |
| 3788 | 3788 | $_SESSION['user_roles'] |
@@ -3989,9 +3989,9 @@ discard block |
||
| 3989 | 3989 | if ((int) $start === 0) { |
| 3990 | 3990 | DB::query( |
| 3991 | 3991 | 'SELECT i.id |
| 3992 | - FROM ' . prefixTable('items') . ' as i |
|
| 3993 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
| 3994 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item) |
|
| 3992 | + FROM ' . prefixTable('items').' as i |
|
| 3993 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
| 3994 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item) |
|
| 3995 | 3995 | WHERE %l |
| 3996 | 3996 | ORDER BY i.label ASC, l.date DESC', |
| 3997 | 3997 | $where |
@@ -4055,8 +4055,8 @@ discard block |
||
| 4055 | 4055 | // Run query |
| 4056 | 4056 | $dataItem = DB::queryfirstrow( |
| 4057 | 4057 | 'SELECT i.pw AS pw, s.share_key AS share_key |
| 4058 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4059 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
| 4058 | + FROM ' . prefixTable('items').' AS i |
|
| 4059 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
| 4060 | 4060 | WHERE user_id = %i AND i.id = %i', |
| 4061 | 4061 | $_SESSION['user_id'], |
| 4062 | 4062 | $post_item_id |
@@ -4099,7 +4099,7 @@ discard block |
||
| 4099 | 4099 | if (null !== $post_item_id && empty($post_item_id) === false) { |
| 4100 | 4100 | $dataItem = DB::queryfirstrow( |
| 4101 | 4101 | 'SELECT perso, anyone_can_modify |
| 4102 | - FROM ' . prefixTable('items') . ' |
|
| 4102 | + FROM ' . prefixTable('items').' |
|
| 4103 | 4103 | WHERE id=%i', |
| 4104 | 4104 | $post_item_id |
| 4105 | 4105 | ); |
@@ -4136,7 +4136,7 @@ discard block |
||
| 4136 | 4136 | */ |
| 4137 | 4137 | |
| 4138 | 4138 | // Lock Item (if already locked), go back and warn |
| 4139 | - $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', $post_item_id); |
|
| 4139 | + $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', $post_item_id); |
|
| 4140 | 4140 | |
| 4141 | 4141 | // If token is taken for this Item and delay is passed then delete it. |
| 4142 | 4142 | if ( |
@@ -4147,7 +4147,7 @@ discard block |
||
| 4147 | 4147 | DB::delete(prefixTable('items_edition'), 'item_id = %i', $post_item_id); |
| 4148 | 4148 | //reload the previous data |
| 4149 | 4149 | $dataTmp = DB::queryFirstRow( |
| 4150 | - 'SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', |
|
| 4150 | + 'SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', |
|
| 4151 | 4151 | $post_item_id |
| 4152 | 4152 | ); |
| 4153 | 4153 | } |
@@ -4187,7 +4187,7 @@ discard block |
||
| 4187 | 4187 | // do query on this folder |
| 4188 | 4188 | $data_this_folder = DB::queryFirstRow( |
| 4189 | 4189 | 'SELECT id, personal_folder, title |
| 4190 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4190 | + FROM ' . prefixTable('nested_tree').' |
|
| 4191 | 4191 | WHERE id = %s', |
| 4192 | 4192 | $post_groupe |
| 4193 | 4193 | ); |
@@ -4224,8 +4224,8 @@ discard block |
||
| 4224 | 4224 | $visibilite = ''; |
| 4225 | 4225 | $data = DB::queryFirstRow( |
| 4226 | 4226 | 'SELECT m.valeur, n.personal_folder |
| 4227 | - FROM ' . prefixTable('misc') . ' AS m |
|
| 4228 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id) |
|
| 4227 | + FROM ' . prefixTable('misc').' AS m |
|
| 4228 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id) |
|
| 4229 | 4229 | WHERE type=%s AND intitule = %s', |
| 4230 | 4230 | 'complex', |
| 4231 | 4231 | $post_groupe |
@@ -4238,8 +4238,8 @@ discard block |
||
| 4238 | 4238 | // Prepare Item actual visibility (what Users/Roles can see it) |
| 4239 | 4239 | $rows = DB::query( |
| 4240 | 4240 | 'SELECT t.title |
| 4241 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 4242 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 4241 | + FROM ' . prefixTable('roles_values').' as v |
|
| 4242 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 4243 | 4243 | WHERE v.folder_id = %i |
| 4244 | 4244 | GROUP BY title', |
| 4245 | 4245 | $post_groupe |
@@ -4248,7 +4248,7 @@ discard block |
||
| 4248 | 4248 | if (empty($visibilite)) { |
| 4249 | 4249 | $visibilite = $record['title']; |
| 4250 | 4250 | } else { |
| 4251 | - $visibilite .= ' - ' . $record['title']; |
|
| 4251 | + $visibilite .= ' - '.$record['title']; |
|
| 4252 | 4252 | } |
| 4253 | 4253 | } |
| 4254 | 4254 | } else { |
@@ -4258,14 +4258,14 @@ discard block |
||
| 4258 | 4258 | // do new query to know if current folder is pf |
| 4259 | 4259 | $data_pf = DB::queryFirstRow( |
| 4260 | 4260 | 'SELECT personal_folder |
| 4261 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4261 | + FROM ' . prefixTable('nested_tree').' |
|
| 4262 | 4262 | WHERE id = %s', |
| 4263 | 4263 | $post_groupe |
| 4264 | 4264 | ); |
| 4265 | 4265 | |
| 4266 | 4266 | $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0; |
| 4267 | 4267 | |
| 4268 | - $visibilite = $_SESSION['name'] . ' ' . $_SESSION['lastname'] . ' (' . $_SESSION['login'] . ')'; |
|
| 4268 | + $visibilite = $_SESSION['name'].' '.$_SESSION['lastname'].' ('.$_SESSION['login'].')'; |
|
| 4269 | 4269 | } |
| 4270 | 4270 | |
| 4271 | 4271 | recupDroitCreationSansComplexite($post_groupe); |
@@ -4275,8 +4275,8 @@ discard block |
||
| 4275 | 4275 | $listOptionsForRoles = array(); |
| 4276 | 4276 | $rows = DB::query( |
| 4277 | 4277 | 'SELECT r.role_id AS role_id, t.title AS title |
| 4278 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 4279 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 4278 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 4279 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 4280 | 4280 | WHERE r.folder_id = %i', |
| 4281 | 4281 | $post_groupe |
| 4282 | 4282 | ); |
@@ -4290,7 +4290,7 @@ discard block |
||
| 4290 | 4290 | ); |
| 4291 | 4291 | $rows2 = DB::query( |
| 4292 | 4292 | 'SELECT id, login, fonction_id, email, name, lastname |
| 4293 | - FROM ' . prefixTable('users') . ' |
|
| 4293 | + FROM ' . prefixTable('users').' |
|
| 4294 | 4294 | WHERE admin = 0' |
| 4295 | 4295 | ); |
| 4296 | 4296 | foreach ($rows2 as $record2) { |
@@ -4304,7 +4304,7 @@ discard block |
||
| 4304 | 4304 | array( |
| 4305 | 4305 | 'id' => $record2['id'], |
| 4306 | 4306 | 'login' => $record2['login'], |
| 4307 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 4307 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 4308 | 4308 | 'email' => $record2['email'], |
| 4309 | 4309 | ) |
| 4310 | 4310 | ); |
@@ -4321,13 +4321,13 @@ discard block |
||
| 4321 | 4321 | //db::debugmode(true); |
| 4322 | 4322 | $access = DB::queryFirstRow( |
| 4323 | 4323 | 'SELECT type |
| 4324 | - FROM ' . prefixTable('roles_values') . ' |
|
| 4324 | + FROM ' . prefixTable('roles_values').' |
|
| 4325 | 4325 | WHERE role_id = %i AND folder_id = %i', |
| 4326 | 4326 | $role, |
| 4327 | 4327 | $post_groupe |
| 4328 | 4328 | ); |
| 4329 | 4329 | //db::debugmode(false); |
| 4330 | - if (DB::count()>0) { |
|
| 4330 | + if (DB::count() > 0) { |
|
| 4331 | 4331 | if ($access['type'] === 'R') { |
| 4332 | 4332 | array_push($arrTmp, 10); |
| 4333 | 4333 | } elseif ($access['type'] === 'W') { |
@@ -4397,7 +4397,7 @@ discard block |
||
| 4397 | 4397 | // Get some info before deleting |
| 4398 | 4398 | $data = DB::queryFirstRow( |
| 4399 | 4399 | 'SELECT name, id_item, file |
| 4400 | - FROM ' . prefixTable('files') . ' |
|
| 4400 | + FROM ' . prefixTable('files').' |
|
| 4401 | 4401 | WHERE id = %i', |
| 4402 | 4402 | $fileId |
| 4403 | 4403 | ); |
@@ -4405,7 +4405,7 @@ discard block |
||
| 4405 | 4405 | // Load item data |
| 4406 | 4406 | $data_item = DB::queryFirstRow( |
| 4407 | 4407 | 'SELECT id_tree |
| 4408 | - FROM ' . prefixTable('items') . ' |
|
| 4408 | + FROM ' . prefixTable('items').' |
|
| 4409 | 4409 | WHERE id = %i', |
| 4410 | 4410 | $data['id_item'] |
| 4411 | 4411 | ); |
@@ -4432,7 +4432,7 @@ discard block |
||
| 4432 | 4432 | $_SESSION['user_id'], |
| 4433 | 4433 | 'at_modification', |
| 4434 | 4434 | $_SESSION['login'], |
| 4435 | - 'at_del_file : ' . $data['name'] |
|
| 4435 | + 'at_del_file : '.$data['name'] |
|
| 4436 | 4436 | ); |
| 4437 | 4437 | |
| 4438 | 4438 | // DElete sharekeys |
@@ -4443,7 +4443,7 @@ discard block |
||
| 4443 | 4443 | ); |
| 4444 | 4444 | |
| 4445 | 4445 | // Delete file from server |
| 4446 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']), $SETTINGS); |
|
| 4446 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']), $SETTINGS); |
|
| 4447 | 4447 | } |
| 4448 | 4448 | |
| 4449 | 4449 | echo (string) prepareExchangedData( |
@@ -4462,7 +4462,7 @@ discard block |
||
| 4462 | 4462 | case 'clear_html_tags': |
| 4463 | 4463 | // Get information for this item |
| 4464 | 4464 | $dataItem = DB::queryfirstrow( |
| 4465 | - 'SELECT description FROM ' . prefixTable('items') . ' WHERE id=%i', |
|
| 4465 | + 'SELECT description FROM '.prefixTable('items').' WHERE id=%i', |
|
| 4466 | 4466 | filter_input(INPUT_POST, 'id_item', FILTER_SANITIZE_NUMBER_INT) |
| 4467 | 4467 | ); |
| 4468 | 4468 | // Clean up the string |
@@ -4500,12 +4500,12 @@ discard block |
||
| 4500 | 4500 | // Update SESSION with this new favourite |
| 4501 | 4501 | $data = DB::queryfirstrow( |
| 4502 | 4502 | 'SELECT label,id_tree |
| 4503 | - FROM ' . prefixTable('items') . ' |
|
| 4503 | + FROM ' . prefixTable('items').' |
|
| 4504 | 4504 | WHERE id = ' . mysqli_real_escape_string($link, $post_item_id) |
| 4505 | 4505 | ); |
| 4506 | 4506 | $_SESSION['favourites_tab'][$post_item_id] = array( |
| 4507 | 4507 | 'label' => $data['label'], |
| 4508 | - 'url' => 'index.php?page=items&group=' . $data['id_tree'] . '&id=' . $post_item_id, |
|
| 4508 | + 'url' => 'index.php?page=items&group='.$data['id_tree'].'&id='.$post_item_id, |
|
| 4509 | 4509 | ); |
| 4510 | 4510 | } elseif ((int) filter_input(INPUT_POST, 'action', FILTER_SANITIZE_NUMBER_INT) === 1) { |
| 4511 | 4511 | // delete from session |
@@ -4574,8 +4574,8 @@ discard block |
||
| 4574 | 4574 | // get data about item |
| 4575 | 4575 | $dataSource = DB::queryfirstrow( |
| 4576 | 4576 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 4577 | - FROM ' . prefixTable('items') . ' as i |
|
| 4578 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 4577 | + FROM ' . prefixTable('items').' as i |
|
| 4578 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 4579 | 4579 | WHERE i.id=%i', |
| 4580 | 4580 | $post_item_id |
| 4581 | 4581 | ); |
@@ -4583,7 +4583,7 @@ discard block |
||
| 4583 | 4583 | // get data about new folder |
| 4584 | 4584 | $dataDestination = DB::queryfirstrow( |
| 4585 | 4585 | 'SELECT personal_folder, title |
| 4586 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4586 | + FROM ' . prefixTable('nested_tree').' |
|
| 4587 | 4587 | WHERE id = %i', |
| 4588 | 4588 | $post_folder_id |
| 4589 | 4589 | ); |
@@ -4635,7 +4635,7 @@ discard block |
||
| 4635 | 4635 | // Get fields for this Item |
| 4636 | 4636 | $rows = DB::query( |
| 4637 | 4637 | 'SELECT id |
| 4638 | - FROM ' . prefixTable('categories_items') . ' |
|
| 4638 | + FROM ' . prefixTable('categories_items').' |
|
| 4639 | 4639 | WHERE item_id = %i', |
| 4640 | 4640 | $post_item_id |
| 4641 | 4641 | ); |
@@ -4652,7 +4652,7 @@ discard block |
||
| 4652 | 4652 | // Get FILES for this Item |
| 4653 | 4653 | $rows = DB::query( |
| 4654 | 4654 | 'SELECT id |
| 4655 | - FROM ' . prefixTable('files') . ' |
|
| 4655 | + FROM ' . prefixTable('files').' |
|
| 4656 | 4656 | WHERE id_item = %i', |
| 4657 | 4657 | $post_item_id |
| 4658 | 4658 | ); |
@@ -4697,7 +4697,7 @@ discard block |
||
| 4697 | 4697 | // Get the ITEM object key for the user |
| 4698 | 4698 | $userKey = DB::queryFirstRow( |
| 4699 | 4699 | 'SELECT share_key |
| 4700 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 4700 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 4701 | 4701 | WHERE user_id = %i AND object_id = %i', |
| 4702 | 4702 | $_SESSION['user_id'], |
| 4703 | 4703 | $post_item_id |
@@ -4708,8 +4708,8 @@ discard block |
||
| 4708 | 4708 | // This is a public object |
| 4709 | 4709 | $users = DB::query( |
| 4710 | 4710 | 'SELECT id, public_key |
| 4711 | - FROM ' . prefixTable('users') . ' |
|
| 4712 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 4711 | + FROM ' . prefixTable('users').' |
|
| 4712 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 4713 | 4713 | AND public_key != ""' |
| 4714 | 4714 | ); |
| 4715 | 4715 | foreach ($users as $user) { |
@@ -4729,14 +4729,14 @@ discard block |
||
| 4729 | 4729 | // Get fields for this Item |
| 4730 | 4730 | $rows = DB::query( |
| 4731 | 4731 | 'SELECT id |
| 4732 | - FROM ' . prefixTable('categories_items') . ' |
|
| 4732 | + FROM ' . prefixTable('categories_items').' |
|
| 4733 | 4733 | WHERE item_id = %i', |
| 4734 | 4734 | $post_item_id |
| 4735 | 4735 | ); |
| 4736 | 4736 | foreach ($rows as $field) { |
| 4737 | 4737 | $userKey = DB::queryFirstRow( |
| 4738 | 4738 | 'SELECT share_key |
| 4739 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 4739 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 4740 | 4740 | WHERE user_id = %i AND object_id = %i', |
| 4741 | 4741 | $_SESSION['user_id'], |
| 4742 | 4742 | $field['id'] |
@@ -4747,8 +4747,8 @@ discard block |
||
| 4747 | 4747 | // This is a public object |
| 4748 | 4748 | $users = DB::query( |
| 4749 | 4749 | 'SELECT id, public_key |
| 4750 | - FROM ' . prefixTable('users') . ' |
|
| 4751 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 4750 | + FROM ' . prefixTable('users').' |
|
| 4751 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 4752 | 4752 | AND public_key != ""' |
| 4753 | 4753 | ); |
| 4754 | 4754 | foreach ($users as $user) { |
@@ -4769,14 +4769,14 @@ discard block |
||
| 4769 | 4769 | // Get FILES for this Item |
| 4770 | 4770 | $rows = DB::query( |
| 4771 | 4771 | 'SELECT id |
| 4772 | - FROM ' . prefixTable('files') . ' |
|
| 4772 | + FROM ' . prefixTable('files').' |
|
| 4773 | 4773 | WHERE id_item = %i', |
| 4774 | 4774 | $post_item_id |
| 4775 | 4775 | ); |
| 4776 | 4776 | foreach ($rows as $attachment) { |
| 4777 | 4777 | $userKey = DB::queryFirstRow( |
| 4778 | 4778 | 'SELECT share_key |
| 4779 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 4779 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 4780 | 4780 | WHERE user_id = %i AND object_id = %i', |
| 4781 | 4781 | $_SESSION['user_id'], |
| 4782 | 4782 | $attachment['id'] |
@@ -4787,8 +4787,8 @@ discard block |
||
| 4787 | 4787 | // This is a public object |
| 4788 | 4788 | $users = DB::query( |
| 4789 | 4789 | 'SELECT id, public_key |
| 4790 | - FROM ' . prefixTable('users') . ' |
|
| 4791 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 4790 | + FROM ' . prefixTable('users').' |
|
| 4791 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 4792 | 4792 | AND public_key != ""' |
| 4793 | 4793 | ); |
| 4794 | 4794 | foreach ($users as $user) { |
@@ -4825,7 +4825,7 @@ discard block |
||
| 4825 | 4825 | $_SESSION['user_id'], |
| 4826 | 4826 | 'at_modification', |
| 4827 | 4827 | $_SESSION['login'], |
| 4828 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 4828 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 4829 | 4829 | ); |
| 4830 | 4830 | |
| 4831 | 4831 | $returnValues = array( |
@@ -4878,8 +4878,8 @@ discard block |
||
| 4878 | 4878 | // get data about item |
| 4879 | 4879 | $dataSource = DB::queryfirstrow( |
| 4880 | 4880 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 4881 | - FROM ' . prefixTable('items') . ' as i |
|
| 4882 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 4881 | + FROM ' . prefixTable('items').' as i |
|
| 4882 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 4883 | 4883 | WHERE i.id=%i', |
| 4884 | 4884 | $item_id |
| 4885 | 4885 | ); |
@@ -4901,7 +4901,7 @@ discard block |
||
| 4901 | 4901 | |
| 4902 | 4902 | // get data about new folder |
| 4903 | 4903 | $dataDestination = DB::queryfirstrow( |
| 4904 | - 'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 4904 | + 'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 4905 | 4905 | $post_folder_id |
| 4906 | 4906 | ); |
| 4907 | 4907 | |
@@ -4942,7 +4942,7 @@ discard block |
||
| 4942 | 4942 | // Get fields for this Item |
| 4943 | 4943 | $rows = DB::query( |
| 4944 | 4944 | 'SELECT id |
| 4945 | - FROM ' . prefixTable('categories_items') . ' |
|
| 4945 | + FROM ' . prefixTable('categories_items').' |
|
| 4946 | 4946 | WHERE item_id = %i', |
| 4947 | 4947 | $item_id |
| 4948 | 4948 | ); |
@@ -4959,7 +4959,7 @@ discard block |
||
| 4959 | 4959 | // Get FILES for this Item |
| 4960 | 4960 | $rows = DB::query( |
| 4961 | 4961 | 'SELECT id |
| 4962 | - FROM ' . prefixTable('files') . ' |
|
| 4962 | + FROM ' . prefixTable('files').' |
|
| 4963 | 4963 | WHERE id_item = %i', |
| 4964 | 4964 | $item_id |
| 4965 | 4965 | ); |
@@ -5012,7 +5012,7 @@ discard block |
||
| 5012 | 5012 | // Get the ITEM object key for the user |
| 5013 | 5013 | $userKey = DB::queryFirstRow( |
| 5014 | 5014 | 'SELECT share_key |
| 5015 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5015 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5016 | 5016 | WHERE user_id = %i AND object_id = %i', |
| 5017 | 5017 | $_SESSION['user_id'], |
| 5018 | 5018 | $item_id |
@@ -5023,8 +5023,8 @@ discard block |
||
| 5023 | 5023 | // This is a public object |
| 5024 | 5024 | $users = DB::query( |
| 5025 | 5025 | 'SELECT id, public_key |
| 5026 | - FROM ' . prefixTable('users') . ' |
|
| 5027 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 5026 | + FROM ' . prefixTable('users').' |
|
| 5027 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 5028 | 5028 | AND public_key != ""' |
| 5029 | 5029 | ); |
| 5030 | 5030 | foreach ($users as $user) { |
@@ -5044,14 +5044,14 @@ discard block |
||
| 5044 | 5044 | // Get fields for this Item |
| 5045 | 5045 | $rows = DB::query( |
| 5046 | 5046 | 'SELECT id |
| 5047 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5047 | + FROM ' . prefixTable('categories_items').' |
|
| 5048 | 5048 | WHERE item_id = %i', |
| 5049 | 5049 | $item_id |
| 5050 | 5050 | ); |
| 5051 | 5051 | foreach ($rows as $field) { |
| 5052 | 5052 | $userKey = DB::queryFirstRow( |
| 5053 | 5053 | 'SELECT share_key |
| 5054 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5054 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5055 | 5055 | WHERE user_id = %i AND object_id = %i', |
| 5056 | 5056 | $_SESSION['user_id'], |
| 5057 | 5057 | $field['id'] |
@@ -5062,8 +5062,8 @@ discard block |
||
| 5062 | 5062 | // This is a public object |
| 5063 | 5063 | $users = DB::query( |
| 5064 | 5064 | 'SELECT id, public_key |
| 5065 | - FROM ' . prefixTable('users') . ' |
|
| 5066 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 5065 | + FROM ' . prefixTable('users').' |
|
| 5066 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 5067 | 5067 | AND public_key != ""' |
| 5068 | 5068 | ); |
| 5069 | 5069 | foreach ($users as $user) { |
@@ -5084,14 +5084,14 @@ discard block |
||
| 5084 | 5084 | // Get FILES for this Item |
| 5085 | 5085 | $rows = DB::query( |
| 5086 | 5086 | 'SELECT id |
| 5087 | - FROM ' . prefixTable('files') . ' |
|
| 5087 | + FROM ' . prefixTable('files').' |
|
| 5088 | 5088 | WHERE id_item = %i', |
| 5089 | 5089 | $item_id |
| 5090 | 5090 | ); |
| 5091 | 5091 | foreach ($rows as $attachment) { |
| 5092 | 5092 | $userKey = DB::queryFirstRow( |
| 5093 | 5093 | 'SELECT share_key |
| 5094 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5094 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5095 | 5095 | WHERE user_id = %i AND object_id = %i', |
| 5096 | 5096 | $_SESSION['user_id'], |
| 5097 | 5097 | $attachment['id'] |
@@ -5102,8 +5102,8 @@ discard block |
||
| 5102 | 5102 | // This is a public object |
| 5103 | 5103 | $users = DB::query( |
| 5104 | 5104 | 'SELECT id, public_key |
| 5105 | - FROM ' . prefixTable('users') . ' |
|
| 5106 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 5105 | + FROM ' . prefixTable('users').' |
|
| 5106 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 5107 | 5107 | AND public_key != ""' |
| 5108 | 5108 | ); |
| 5109 | 5109 | foreach ($users as $user) { |
@@ -5139,13 +5139,13 @@ discard block |
||
| 5139 | 5139 | $_SESSION['user_id'], |
| 5140 | 5140 | 'at_modification', |
| 5141 | 5141 | $_SESSION['login'], |
| 5142 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5142 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5143 | 5143 | ); |
| 5144 | 5144 | } |
| 5145 | 5145 | } |
| 5146 | 5146 | |
| 5147 | 5147 | // reload cache table |
| 5148 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 5148 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 5149 | 5149 | updateCacheTable('reload', $SETTINGS, ''); |
| 5150 | 5150 | |
| 5151 | 5151 | echo (string) prepareExchangedData( |
@@ -5209,7 +5209,7 @@ discard block |
||
| 5209 | 5209 | // get info |
| 5210 | 5210 | $dataSource = DB::queryfirstrow( |
| 5211 | 5211 | 'SELECT label, id_tree |
| 5212 | - FROM ' . prefixTable('items') . ' |
|
| 5212 | + FROM ' . prefixTable('items').' |
|
| 5213 | 5213 | WHERE id=%i', |
| 5214 | 5214 | $item_id |
| 5215 | 5215 | ); |
@@ -5309,8 +5309,8 @@ discard block |
||
| 5309 | 5309 | $content = explode(',', filter_input(INPUT_POST, 'content', FILTER_SANITIZE_STRING)); |
| 5310 | 5310 | } |
| 5311 | 5311 | // Variables |
| 5312 | - $dataAuthor = DB::queryfirstrow('SELECT email,login FROM ' . prefixTable('users') . ' WHERE id= ' . $content[1]); |
|
| 5313 | - $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM ' . prefixTable('items') . ' WHERE id= ' . $content[0]); |
|
| 5312 | + $dataAuthor = DB::queryfirstrow('SELECT email,login FROM '.prefixTable('users').' WHERE id= '.$content[1]); |
|
| 5313 | + $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM '.prefixTable('items').' WHERE id= '.$content[0]); |
|
| 5314 | 5314 | |
| 5315 | 5315 | // Get path |
| 5316 | 5316 | $path = geItemReadablePath( |
@@ -5324,7 +5324,7 @@ discard block |
||
| 5324 | 5324 | langHdl('email_request_access_subject'), |
| 5325 | 5325 | str_replace( |
| 5326 | 5326 | array('#tp_item_author#', '#tp_user#', '#tp_item#'), |
| 5327 | - array(' ' . addslashes($dataAuthor['login']), addslashes($_SESSION['login']), $path), |
|
| 5327 | + array(' '.addslashes($dataAuthor['login']), addslashes($_SESSION['login']), $path), |
|
| 5328 | 5328 | langHdl('email_request_access_mail') |
| 5329 | 5329 | ), |
| 5330 | 5330 | $dataAuthor['email'], |
@@ -5335,7 +5335,7 @@ discard block |
||
| 5335 | 5335 | } elseif ($post_cat === 'share_this_item') { |
| 5336 | 5336 | $dataItem = DB::queryfirstrow( |
| 5337 | 5337 | 'SELECT label,id_tree |
| 5338 | - FROM ' . prefixTable('items') . ' |
|
| 5338 | + FROM ' . prefixTable('items').' |
|
| 5339 | 5339 | WHERE id= %i', |
| 5340 | 5340 | $post_id |
| 5341 | 5341 | ); |
@@ -5359,7 +5359,7 @@ discard block |
||
| 5359 | 5359 | ), |
| 5360 | 5360 | array( |
| 5361 | 5361 | empty($SETTINGS['email_server_url']) === false ? |
| 5362 | - $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $post_id : $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $post_id, |
|
| 5362 | + $SETTINGS['email_server_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$post_id : $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$post_id, |
|
| 5363 | 5363 | addslashes($_SESSION['login']), |
| 5364 | 5364 | addslashes($path), |
| 5365 | 5365 | ), |
@@ -5394,7 +5394,7 @@ discard block |
||
| 5394 | 5394 | if (filter_input(INPUT_POST, 'notify_type', FILTER_SANITIZE_STRING) === 'on_show') { |
| 5395 | 5395 | // Check if values already exist |
| 5396 | 5396 | $data = DB::queryfirstrow( |
| 5397 | - 'SELECT notification FROM ' . prefixTable('items') . ' WHERE id = %i', |
|
| 5397 | + 'SELECT notification FROM '.prefixTable('items').' WHERE id = %i', |
|
| 5398 | 5398 | $post_item_id |
| 5399 | 5399 | ); |
| 5400 | 5400 | $notifiedUsers = explode(';', $data['notification']); |
@@ -5405,8 +5405,8 @@ discard block |
||
| 5405 | 5405 | prefixTable('items'), |
| 5406 | 5406 | array( |
| 5407 | 5407 | 'notification' => empty($data['notification']) ? |
| 5408 | - filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT) . ';' |
|
| 5409 | - : $data['notification'] . filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT), |
|
| 5408 | + filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT).';' |
|
| 5409 | + : $data['notification'].filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT), |
|
| 5410 | 5410 | ), |
| 5411 | 5411 | 'id=%i', |
| 5412 | 5412 | $post_item_id |
@@ -5422,7 +5422,7 @@ discard block |
||
| 5422 | 5422 | array( |
| 5423 | 5423 | 'notification' => empty($data['notification']) ? |
| 5424 | 5424 | filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT) |
| 5425 | - : $data['notification'] . ';' . filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT), |
|
| 5425 | + : $data['notification'].';'.filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT), |
|
| 5426 | 5426 | ), |
| 5427 | 5427 | 'id=%i', |
| 5428 | 5428 | $post_item_id |
@@ -5447,8 +5447,8 @@ discard block |
||
| 5447 | 5447 | // Get all informations for this item |
| 5448 | 5448 | $dataItem = DB::queryfirstrow( |
| 5449 | 5449 | 'SELECT * |
| 5450 | - FROM ' . prefixTable('items') . ' as i |
|
| 5451 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 5450 | + FROM ' . prefixTable('items').' as i |
|
| 5451 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 5452 | 5452 | WHERE i.id=%i AND l.action = %s', |
| 5453 | 5453 | $dataReceived['item_id'], |
| 5454 | 5454 | 'at_creation' |
@@ -5483,14 +5483,14 @@ discard block |
||
| 5483 | 5483 | ); |
| 5484 | 5484 | // Prepare new line |
| 5485 | 5485 | $data = DB::queryfirstrow( |
| 5486 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC', |
|
| 5486 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC', |
|
| 5487 | 5487 | $dataReceived['item_id'] |
| 5488 | 5488 | ); |
| 5489 | - $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $data['date']) . ' - ' . $_SESSION['login'] . ' - ' . langHdl($data['action']) . ' - ' . $data['raison']; |
|
| 5489 | + $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $data['date']).' - '.$_SESSION['login'].' - '.langHdl($data['action']).' - '.$data['raison']; |
|
| 5490 | 5490 | // send back |
| 5491 | 5491 | $data = array( |
| 5492 | 5492 | 'error' => '', |
| 5493 | - 'new_line' => '<br>' . addslashes($historic), |
|
| 5493 | + 'new_line' => '<br>'.addslashes($historic), |
|
| 5494 | 5494 | ); |
| 5495 | 5495 | echo (string) prepareExchangedData($data, 'encode'); |
| 5496 | 5496 | } else { |
@@ -5524,7 +5524,7 @@ discard block |
||
| 5524 | 5524 | */ |
| 5525 | 5525 | case 'is_item_changed': |
| 5526 | 5526 | $data = DB::queryFirstRow( |
| 5527 | - 'SELECT date FROM ' . prefixTable('log_items') . ' WHERE action = %s AND id_item = %i ORDER BY date DESC', |
|
| 5527 | + 'SELECT date FROM '.prefixTable('log_items').' WHERE action = %s AND id_item = %i ORDER BY date DESC', |
|
| 5528 | 5528 | 'at_modification', |
| 5529 | 5529 | $post_item_id |
| 5530 | 5530 | ); |
@@ -5548,7 +5548,7 @@ discard block |
||
| 5548 | 5548 | } |
| 5549 | 5549 | |
| 5550 | 5550 | // delete all existing old otv codes |
| 5551 | - $rows = DB::query('SELECT id FROM ' . prefixTable('otv') . ' WHERE timestamp < ' . (time() - $SETTINGS['otv_expiration_period'] * 86400)); |
|
| 5551 | + $rows = DB::query('SELECT id FROM '.prefixTable('otv').' WHERE timestamp < '.(time() - $SETTINGS['otv_expiration_period'] * 86400)); |
|
| 5552 | 5552 | foreach ($rows as $record) { |
| 5553 | 5553 | DB::delete(prefixTable('otv'), 'id=%i', $record['id']); |
| 5554 | 5554 | } |
@@ -5570,8 +5570,8 @@ discard block |
||
| 5570 | 5570 | // Should we log a password change? |
| 5571 | 5571 | $itemQ = DB::queryFirstRow( |
| 5572 | 5572 | 'SELECT s.share_key, i.pw |
| 5573 | - FROM ' . prefixTable('items') . ' AS i |
|
| 5574 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id) |
|
| 5573 | + FROM ' . prefixTable('items').' AS i |
|
| 5574 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id) |
|
| 5575 | 5575 | WHERE s.user_id = %i AND s.object_id = %i', |
| 5576 | 5576 | $_SESSION['user_id'], |
| 5577 | 5577 | $post_id |
@@ -5621,8 +5621,8 @@ discard block |
||
| 5621 | 5621 | if (isset($SETTINGS['otv_expiration_period']) === false) { |
| 5622 | 5622 | $SETTINGS['otv_expiration_period'] = 7; |
| 5623 | 5623 | } |
| 5624 | - $url = $SETTINGS['cpassman_url'] . '/index.php?otv=true&' . http_build_query($otv_session); |
|
| 5625 | - $exp_date = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], time() + (intval($SETTINGS['otv_expiration_period']) * 86400)); |
|
| 5624 | + $url = $SETTINGS['cpassman_url'].'/index.php?otv=true&'.http_build_query($otv_session); |
|
| 5625 | + $exp_date = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], time() + (intval($SETTINGS['otv_expiration_period']) * 86400)); |
|
| 5626 | 5626 | |
| 5627 | 5627 | echo json_encode( |
| 5628 | 5628 | array( |
@@ -5659,8 +5659,8 @@ discard block |
||
| 5659 | 5659 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, |
| 5660 | 5660 | f.extension AS extension, f.type AS type, |
| 5661 | 5661 | s.share_key AS share_key |
| 5662 | - FROM ' . prefixTable('files') . ' AS f |
|
| 5663 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 5662 | + FROM ' . prefixTable('files').' AS f |
|
| 5663 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 5664 | 5664 | WHERE s.user_id = %i AND s.object_id = %i', |
| 5665 | 5665 | $_SESSION['user_id'], |
| 5666 | 5666 | $post_id |
@@ -5681,7 +5681,7 @@ discard block |
||
| 5681 | 5681 | //$fileName = basename($file_info['name'], '.'.$file_info['extension']); |
| 5682 | 5682 | |
| 5683 | 5683 | // prepare image info |
| 5684 | - $post_title = basename($file_info['name'], '.' . $file_info['extension']); |
|
| 5684 | + $post_title = basename($file_info['name'], '.'.$file_info['extension']); |
|
| 5685 | 5685 | $post_title = isBase64($post_title) === true ? |
| 5686 | 5686 | base64_decode($post_title) : $post_title; |
| 5687 | 5687 | $image_code = $file_info['file']; |
@@ -5698,7 +5698,7 @@ discard block |
||
| 5698 | 5698 | echo (string) prepareExchangedData( |
| 5699 | 5699 | array( |
| 5700 | 5700 | 'error' => false, |
| 5701 | - 'filename' => $post_title . '.' . $file_info['extension'], |
|
| 5701 | + 'filename' => $post_title.'.'.$file_info['extension'], |
|
| 5702 | 5702 | 'file_type' => $file_info['type'], |
| 5703 | 5703 | 'file_content' => $fileContent, |
| 5704 | 5704 | ), |
@@ -5719,11 +5719,11 @@ discard block |
||
| 5719 | 5719 | |
| 5720 | 5720 | // get file info |
| 5721 | 5721 | $result = DB::queryfirstrow( |
| 5722 | - 'SELECT file FROM ' . prefixTable('files') . ' WHERE id=%i', |
|
| 5722 | + 'SELECT file FROM '.prefixTable('files').' WHERE id=%i', |
|
| 5723 | 5723 | intval(substr(filter_input(INPUT_POST, 'uri', FILTER_SANITIZE_STRING), 1)) |
| 5724 | 5724 | ); |
| 5725 | 5725 | |
| 5726 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $result['file'] . filter_input(INPUT_POST, 'file_suffix', FILTER_SANITIZE_STRING), $SETTINGS); |
|
| 5726 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.$result['file'].filter_input(INPUT_POST, 'file_suffix', FILTER_SANITIZE_STRING), $SETTINGS); |
|
| 5727 | 5727 | |
| 5728 | 5728 | break; |
| 5729 | 5729 | |
@@ -5747,16 +5747,16 @@ discard block |
||
| 5747 | 5747 | $idFolder = $dataReceived['idFolder']; |
| 5748 | 5748 | |
| 5749 | 5749 | // don't check if Personal Folder |
| 5750 | - $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $idFolder); |
|
| 5750 | + $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $idFolder); |
|
| 5751 | 5751 | if ($data['title'] === $_SESSION['user_id']) { |
| 5752 | 5752 | // send data |
| 5753 | - echo '[{"duplicate" : "' . $duplicate . '" , error" : ""}]'; |
|
| 5753 | + echo '[{"duplicate" : "'.$duplicate.'" , error" : ""}]'; |
|
| 5754 | 5754 | } else { |
| 5755 | 5755 | if (filter_input(INPUT_POST, 'option', FILTER_SANITIZE_STRING) === 'same_folder') { |
| 5756 | 5756 | // case unique folder |
| 5757 | 5757 | DB::query( |
| 5758 | 5758 | 'SELECT label |
| 5759 | - FROM ' . prefixTable('items') . ' |
|
| 5759 | + FROM ' . prefixTable('items').' |
|
| 5760 | 5760 | WHERE id_tree = %i AND label = %s', |
| 5761 | 5761 | $idFolder, |
| 5762 | 5762 | $label |
@@ -5768,7 +5768,7 @@ discard block |
||
| 5768 | 5768 | $arrayPf = array(); |
| 5769 | 5769 | if (empty($row['id']) === false) { |
| 5770 | 5770 | $rows = DB::query( |
| 5771 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 5771 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 5772 | 5772 | '1' |
| 5773 | 5773 | ); |
| 5774 | 5774 | foreach ($rows as $record) { |
@@ -5783,12 +5783,12 @@ discard block |
||
| 5783 | 5783 | $where->add('id_tree = %i', $idFolder); |
| 5784 | 5784 | $where->add('label = %s', $label); |
| 5785 | 5785 | if (empty($arrayPf) === false) { |
| 5786 | - $where->add('id_tree NOT IN (' . implode(',', $arrayPf) . ')'); |
|
| 5786 | + $where->add('id_tree NOT IN ('.implode(',', $arrayPf).')'); |
|
| 5787 | 5787 | } |
| 5788 | 5788 | |
| 5789 | 5789 | DB::query( |
| 5790 | 5790 | 'SELECT label |
| 5791 | - FROM ' . prefixTable('items') . ' |
|
| 5791 | + FROM ' . prefixTable('items').' |
|
| 5792 | 5792 | WHERE %l', |
| 5793 | 5793 | $where |
| 5794 | 5794 | ); |
@@ -5800,7 +5800,7 @@ discard block |
||
| 5800 | 5800 | } |
| 5801 | 5801 | |
| 5802 | 5802 | // send data |
| 5803 | - echo '[{"duplicate" : "' . $duplicate . '" , "error" : ""}]'; |
|
| 5803 | + echo '[{"duplicate" : "'.$duplicate.'" , "error" : ""}]'; |
|
| 5804 | 5804 | } |
| 5805 | 5805 | break; |
| 5806 | 5806 | |
@@ -5856,7 +5856,7 @@ discard block |
||
| 5856 | 5856 | } |
| 5857 | 5857 | |
| 5858 | 5858 | //Build tree |
| 5859 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 5859 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 5860 | 5860 | $tree->register(); |
| 5861 | 5861 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 5862 | 5862 | $tree->rebuild(); |
@@ -5907,7 +5907,7 @@ discard block |
||
| 5907 | 5907 | if (empty($arr_data['folders'][$inc]['path']) === true) { |
| 5908 | 5908 | $arr_data['folders'][$inc]['path'] = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
| 5909 | 5909 | } else { |
| 5910 | - $arr_data['folders'][$inc]['path'] .= ' / ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 5910 | + $arr_data['folders'][$inc]['path'] .= ' / '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 5911 | 5911 | } |
| 5912 | 5912 | } |
| 5913 | 5913 | |
@@ -5973,8 +5973,8 @@ discard block |
||
| 5973 | 5973 | $rows_tmp = DB::query( |
| 5974 | 5974 | 'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory, |
| 5975 | 5975 | f.id_category AS category_id |
| 5976 | - FROM ' . prefixTable('categories_folders') . ' AS f |
|
| 5977 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id) |
|
| 5976 | + FROM ' . prefixTable('categories_folders').' AS f |
|
| 5977 | + INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id) |
|
| 5978 | 5978 | WHERE id_folder=%i', |
| 5979 | 5979 | $folder |
| 5980 | 5980 | ); |
@@ -6001,7 +6001,7 @@ discard block |
||
| 6001 | 6001 | $valTemp = ''; |
| 6002 | 6002 | $data = DB::queryFirstRow( |
| 6003 | 6003 | 'SELECT valeur |
| 6004 | - FROM ' . prefixTable('misc') . ' |
|
| 6004 | + FROM ' . prefixTable('misc').' |
|
| 6005 | 6005 | WHERE type = %s AND intitule=%i', |
| 6006 | 6006 | 'complex', |
| 6007 | 6007 | $folder |
@@ -6018,14 +6018,14 @@ discard block |
||
| 6018 | 6018 | $valTemp = ''; |
| 6019 | 6019 | $rows_tmp = DB::query( |
| 6020 | 6020 | 'SELECT t.title |
| 6021 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 6022 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 6021 | + FROM ' . prefixTable('roles_values').' as v |
|
| 6022 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 6023 | 6023 | WHERE v.folder_id = %i |
| 6024 | 6024 | GROUP BY title', |
| 6025 | 6025 | $folder |
| 6026 | 6026 | ); |
| 6027 | 6027 | foreach ($rows_tmp as $record) { |
| 6028 | - $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title']; |
|
| 6028 | + $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title']; |
|
| 6029 | 6029 | } |
| 6030 | 6030 | $arr_data[$folder]['visibilityRoles'] = $valTemp; |
| 6031 | 6031 | } |
@@ -6053,7 +6053,7 @@ discard block |
||
| 6053 | 6053 | // get item info |
| 6054 | 6054 | $dataItem = DB::queryFirstRow( |
| 6055 | 6055 | 'SELECT * |
| 6056 | - FROM ' . prefixTable('items') . ' |
|
| 6056 | + FROM ' . prefixTable('items').' |
|
| 6057 | 6057 | WHERE id=%i', |
| 6058 | 6058 | $post_item_id |
| 6059 | 6059 | ); |
@@ -6063,8 +6063,8 @@ discard block |
||
| 6063 | 6063 | $rows = DB::query( |
| 6064 | 6064 | 'SELECT l.date as date, l.action as action, l.raison as raison, l.raison_iv AS raison_iv, |
| 6065 | 6065 | u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname |
| 6066 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 6067 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 6066 | + FROM ' . prefixTable('log_items').' as l |
|
| 6067 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 6068 | 6068 | WHERE id_item=%i AND action <> %s |
| 6069 | 6069 | ORDER BY date DESC', |
| 6070 | 6070 | $post_item_id, |
@@ -6075,7 +6075,7 @@ discard block |
||
| 6075 | 6075 | |
| 6076 | 6076 | // imported via API |
| 6077 | 6077 | if (empty($record['login'])) { |
| 6078 | - $record['login'] = langHdl('imported_via_api') . ' [' . $record['raison'] . ']'; |
|
| 6078 | + $record['login'] = langHdl('imported_via_api').' ['.$record['raison'].']'; |
|
| 6079 | 6079 | } |
| 6080 | 6080 | |
| 6081 | 6081 | if ( |
@@ -6086,13 +6086,13 @@ discard block |
||
| 6086 | 6086 | ) { |
| 6087 | 6087 | // Prepare avatar |
| 6088 | 6088 | if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) { |
| 6089 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) { |
|
| 6090 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb']; |
|
| 6089 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) { |
|
| 6090 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb']; |
|
| 6091 | 6091 | } else { |
| 6092 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6092 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6093 | 6093 | } |
| 6094 | 6094 | } else { |
| 6095 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6095 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6096 | 6096 | } |
| 6097 | 6097 | |
| 6098 | 6098 | // Prepare action |
@@ -6109,19 +6109,19 @@ discard block |
||
| 6109 | 6109 | $action = langHdl($reason[0]); |
| 6110 | 6110 | if ($reason[0] === 'at_moved') { |
| 6111 | 6111 | $tmp = explode(' -> ', $reason[1]); |
| 6112 | - $detail = langHdl('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . langHdl('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>'; |
|
| 6112 | + $detail = langHdl('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.langHdl('to').' <span class="font-weight-light">'.$tmp[1].' </span>'; |
|
| 6113 | 6113 | } elseif ($reason[0] === 'at_field') { |
| 6114 | 6114 | $tmp = explode(' => ', $reason[1]); |
| 6115 | 6115 | if (count($tmp) > 1) { |
| 6116 | - $detail = '<b>' . trim($tmp[0]) . '</b> | ' . langHdl('previous_value') . |
|
| 6117 | - ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>'; |
|
| 6116 | + $detail = '<b>'.trim($tmp[0]).'</b> | '.langHdl('previous_value'). |
|
| 6117 | + ': <span class="font-weight-light">'.trim($tmp[1]).'</span>'; |
|
| 6118 | 6118 | } else { |
| 6119 | 6119 | $detail = trim($reason[1]); |
| 6120 | 6120 | } |
| 6121 | 6121 | } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) { |
| 6122 | 6122 | $tmp = explode(' => ', $reason[1]); |
| 6123 | 6123 | $detail = empty(trim($tmp[0])) === true ? |
| 6124 | - langHdl('no_previous_value') : langHdl('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>'; |
|
| 6124 | + langHdl('no_previous_value') : langHdl('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>'; |
|
| 6125 | 6125 | } elseif ($reason[0] === 'at_automatic_del') { |
| 6126 | 6126 | $detail = langHdl($reason[1]); |
| 6127 | 6127 | } elseif ($reason[0] === 'at_anyoneconmodify') { |
@@ -6130,7 +6130,7 @@ discard block |
||
| 6130 | 6130 | $tmp = explode(':', $reason[1]); |
| 6131 | 6131 | $tmp = explode('.', $tmp[0]); |
| 6132 | 6132 | $detail = isBase64($tmp[0]) === true ? |
| 6133 | - base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0]; |
|
| 6133 | + base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0]; |
|
| 6134 | 6134 | } elseif ($reason[0] === 'at_import') { |
| 6135 | 6135 | $detail = ''; |
| 6136 | 6136 | } elseif (in_array($reason[0], array('csv', 'pdf')) === true) { |
@@ -6149,8 +6149,8 @@ discard block |
||
| 6149 | 6149 | array( |
| 6150 | 6150 | 'avatar' => $avatar, |
| 6151 | 6151 | 'login' => $record['login'], |
| 6152 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
| 6153 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $record['date']), |
|
| 6152 | + 'name' => $record['name'].' '.$record['lastname'], |
|
| 6153 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $record['date']), |
|
| 6154 | 6154 | 'action' => $action, |
| 6155 | 6155 | 'detail' => $detail, |
| 6156 | 6156 | ) |
@@ -6231,18 +6231,18 @@ discard block |
||
| 6231 | 6231 | |
| 6232 | 6232 | // get some info to add to the notification email |
| 6233 | 6233 | $resp_user = DB::queryfirstrow( |
| 6234 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
| 6234 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
| 6235 | 6235 | $_SESSION['user_id'] |
| 6236 | 6236 | ); |
| 6237 | 6237 | $resp_folder = DB::queryfirstrow( |
| 6238 | - 'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 6238 | + 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 6239 | 6239 | $folder |
| 6240 | 6240 | ); |
| 6241 | 6241 | |
| 6242 | 6242 | // notify Managers |
| 6243 | 6243 | $rows = DB::query( |
| 6244 | 6244 | 'SELECT email |
| 6245 | - FROM ' . prefixTable('users') . ' |
|
| 6245 | + FROM ' . prefixTable('users').' |
|
| 6246 | 6246 | WHERE `gestionnaire` = %i AND `email` IS NOT NULL', |
| 6247 | 6247 | 1 |
| 6248 | 6248 | ); |
@@ -6273,14 +6273,14 @@ discard block |
||
| 6273 | 6273 | // Get list of users |
| 6274 | 6274 | $usersList = array(); |
| 6275 | 6275 | $usersString = ''; |
| 6276 | - $rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC'); |
|
| 6276 | + $rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC'); |
|
| 6277 | 6277 | foreach ($rows as $record) { |
| 6278 | 6278 | $usersList[$record['login']] = array( |
| 6279 | 6279 | 'id' => $record['id'], |
| 6280 | 6280 | 'login' => $record['login'], |
| 6281 | 6281 | 'email' => $record['email'], |
| 6282 | 6282 | ); |
| 6283 | - $usersString .= $record['id'] . '#' . $record['login'] . ';'; |
|
| 6283 | + $usersString .= $record['id'].'#'.$record['login'].';'; |
|
| 6284 | 6284 | } |
| 6285 | 6285 | |
| 6286 | 6286 | $data = array( |
@@ -6314,7 +6314,7 @@ discard block |
||
| 6314 | 6314 | // Send email |
| 6315 | 6315 | $dataItem = DB::queryfirstrow( |
| 6316 | 6316 | 'SELECT label, id_tree |
| 6317 | - FROM ' . prefixTable('items') . ' |
|
| 6317 | + FROM ' . prefixTable('items').' |
|
| 6318 | 6318 | WHERE id = %i', |
| 6319 | 6319 | $post_item_id |
| 6320 | 6320 | ); |
@@ -6408,7 +6408,7 @@ discard block |
||
| 6408 | 6408 | |
| 6409 | 6409 | DB::query( |
| 6410 | 6410 | 'SELECT * |
| 6411 | - FROM ' . prefixTable('notification') . ' |
|
| 6411 | + FROM ' . prefixTable('notification').' |
|
| 6412 | 6412 | WHERE item_id = %i AND user_id = %i', |
| 6413 | 6413 | $post_item_id, |
| 6414 | 6414 | $_SESSION['user_id'] |
@@ -6474,7 +6474,7 @@ discard block |
||
| 6474 | 6474 | // And related logs |
| 6475 | 6475 | $rows = DB::query( |
| 6476 | 6476 | 'SELECT id, file AS filename |
| 6477 | - FROM ' . prefixTable('files') . ' |
|
| 6477 | + FROM ' . prefixTable('files').' |
|
| 6478 | 6478 | WHERE id_item = %i AND confirmed = %i', |
| 6479 | 6479 | $post_item_id, |
| 6480 | 6480 | 0 |
@@ -6488,12 +6488,12 @@ discard block |
||
| 6488 | 6488 | ); |
| 6489 | 6489 | |
| 6490 | 6490 | // Delete file on server |
| 6491 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename'])); |
|
| 6491 | + unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename'])); |
|
| 6492 | 6492 | |
| 6493 | 6493 | // Delete related logs |
| 6494 | 6494 | $logFile = DB::query( |
| 6495 | 6495 | 'SELECT increment_id, raison |
| 6496 | - FROM ' . prefixTable('log_items') . ' |
|
| 6496 | + FROM ' . prefixTable('log_items').' |
|
| 6497 | 6497 | WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"', |
| 6498 | 6498 | $post_item_id, |
| 6499 | 6499 | $_SESSION['user_id'], |
@@ -6546,7 +6546,7 @@ discard block |
||
| 6546 | 6546 | // Confirm attachments |
| 6547 | 6547 | $rows = DB::query( |
| 6548 | 6548 | 'SELECT id, file AS filename |
| 6549 | - FROM ' . prefixTable('files') . ' |
|
| 6549 | + FROM ' . prefixTable('files').' |
|
| 6550 | 6550 | WHERE id_item = %i AND confirmed = %i', |
| 6551 | 6551 | $post_item_id, |
| 6552 | 6552 | 0 |
@@ -6583,15 +6583,15 @@ discard block |
||
| 6583 | 6583 | case 'autocomplete_tags': |
| 6584 | 6584 | // Get a list off all existing TAGS |
| 6585 | 6585 | $listOfTags = ''; |
| 6586 | - $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $get['term']); |
|
| 6586 | + $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $get['term']); |
|
| 6587 | 6587 | foreach ($rows as $record) { |
| 6588 | 6588 | if (empty($listOfTags)) { |
| 6589 | - $listOfTags = '"' . $record['tag'] . '"'; |
|
| 6589 | + $listOfTags = '"'.$record['tag'].'"'; |
|
| 6590 | 6590 | } else { |
| 6591 | - $listOfTags .= ', "' . $record['tag'] . '"'; |
|
| 6591 | + $listOfTags .= ', "'.$record['tag'].'"'; |
|
| 6592 | 6592 | } |
| 6593 | 6593 | } |
| 6594 | - echo '[' . $listOfTags . ']'; |
|
| 6594 | + echo '['.$listOfTags.']'; |
|
| 6595 | 6595 | break; |
| 6596 | 6596 | } |
| 6597 | 6597 | } |
@@ -6607,7 +6607,7 @@ discard block |
||
| 6607 | 6607 | { |
| 6608 | 6608 | $data = DB::queryFirstRow( |
| 6609 | 6609 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 6610 | - FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 6610 | + FROM ' . prefixTable('nested_tree').' WHERE id = %i', |
|
| 6611 | 6611 | $groupe |
| 6612 | 6612 | ); |
| 6613 | 6613 | // Check if it's in a personal folder. If yes, then force complexity overhead. |
@@ -89,25 +89,25 @@ discard block |
||
| 89 | 89 | // Check KEY |
| 90 | 90 | |
| 91 | 91 | if ($post_key !== $_SESSION['key']) { |
| 92 | - echo prepareExchangedData( |
|
| 93 | - [ |
|
| 94 | - 'error' => true, |
|
| 95 | - 'message' => langHdl('key_is_not_correct'), |
|
| 96 | - ], |
|
| 97 | - 'encode' |
|
| 98 | - ); |
|
| 99 | - break; |
|
| 100 | - } |
|
| 101 | - if ($_SESSION['is_admin'] === false) { |
|
| 102 | - echo prepareExchangedData( |
|
| 103 | - [ |
|
| 104 | - 'error' => true, |
|
| 105 | - 'message' => langHdl('error_not_allowed_to'), |
|
| 106 | - ], |
|
| 107 | - 'encode' |
|
| 108 | - ); |
|
| 109 | - break; |
|
| 110 | - } |
|
| 92 | + echo prepareExchangedData( |
|
| 93 | + [ |
|
| 94 | + 'error' => true, |
|
| 95 | + 'message' => langHdl('key_is_not_correct'), |
|
| 96 | + ], |
|
| 97 | + 'encode' |
|
| 98 | + ); |
|
| 99 | + break; |
|
| 100 | + } |
|
| 101 | + if ($_SESSION['is_admin'] === false) { |
|
| 102 | + echo prepareExchangedData( |
|
| 103 | + [ |
|
| 104 | + 'error' => true, |
|
| 105 | + 'message' => langHdl('error_not_allowed_to'), |
|
| 106 | + ], |
|
| 107 | + 'encode' |
|
| 108 | + ); |
|
| 109 | + break; |
|
| 110 | + } |
|
| 111 | 111 | |
| 112 | 112 | $categoriesSelect = ''; |
| 113 | 113 | $arrCategories = $arrFields = []; |
@@ -235,25 +235,25 @@ discard block |
||
| 235 | 235 | // Check KEY |
| 236 | 236 | |
| 237 | 237 | if ($post_key !== $_SESSION['key']) { |
| 238 | - echo prepareExchangedData( |
|
| 239 | - [ |
|
| 240 | - 'error' => true, |
|
| 241 | - 'message' => langHdl('key_is_not_correct'), |
|
| 242 | - ], |
|
| 243 | - 'encode' |
|
| 244 | - ); |
|
| 245 | - break; |
|
| 246 | - } |
|
| 247 | - if ($_SESSION['is_admin'] === false) { |
|
| 248 | - echo prepareExchangedData( |
|
| 249 | - [ |
|
| 250 | - 'error' => true, |
|
| 251 | - 'message' => langHdl('error_not_allowed_to'), |
|
| 252 | - ], |
|
| 253 | - 'encode' |
|
| 254 | - ); |
|
| 255 | - break; |
|
| 256 | - } |
|
| 238 | + echo prepareExchangedData( |
|
| 239 | + [ |
|
| 240 | + 'error' => true, |
|
| 241 | + 'message' => langHdl('key_is_not_correct'), |
|
| 242 | + ], |
|
| 243 | + 'encode' |
|
| 244 | + ); |
|
| 245 | + break; |
|
| 246 | + } |
|
| 247 | + if ($_SESSION['is_admin'] === false) { |
|
| 248 | + echo prepareExchangedData( |
|
| 249 | + [ |
|
| 250 | + 'error' => true, |
|
| 251 | + 'message' => langHdl('error_not_allowed_to'), |
|
| 252 | + ], |
|
| 253 | + 'encode' |
|
| 254 | + ); |
|
| 255 | + break; |
|
| 256 | + } |
|
| 257 | 257 | |
| 258 | 258 | // Decrypt and retrieve data in JSON format |
| 259 | 259 | $dataReceived = prepareExchangedData($post_data, 'decode'); |
@@ -307,25 +307,25 @@ discard block |
||
| 307 | 307 | // Check KEY |
| 308 | 308 | |
| 309 | 309 | if ($post_key !== $_SESSION['key']) { |
| 310 | - echo prepareExchangedData( |
|
| 311 | - [ |
|
| 312 | - 'error' => true, |
|
| 313 | - 'message' => langHdl('key_is_not_correct'), |
|
| 314 | - ], |
|
| 315 | - 'encode' |
|
| 316 | - ); |
|
| 317 | - break; |
|
| 318 | - } |
|
| 319 | - if ($_SESSION['is_admin'] === false) { |
|
| 320 | - echo prepareExchangedData( |
|
| 321 | - [ |
|
| 322 | - 'error' => true, |
|
| 323 | - 'message' => langHdl('error_not_allowed_to'), |
|
| 324 | - ], |
|
| 325 | - 'encode' |
|
| 326 | - ); |
|
| 327 | - break; |
|
| 328 | - } |
|
| 310 | + echo prepareExchangedData( |
|
| 311 | + [ |
|
| 312 | + 'error' => true, |
|
| 313 | + 'message' => langHdl('key_is_not_correct'), |
|
| 314 | + ], |
|
| 315 | + 'encode' |
|
| 316 | + ); |
|
| 317 | + break; |
|
| 318 | + } |
|
| 319 | + if ($_SESSION['is_admin'] === false) { |
|
| 320 | + echo prepareExchangedData( |
|
| 321 | + [ |
|
| 322 | + 'error' => true, |
|
| 323 | + 'message' => langHdl('error_not_allowed_to'), |
|
| 324 | + ], |
|
| 325 | + 'encode' |
|
| 326 | + ); |
|
| 327 | + break; |
|
| 328 | + } |
|
| 329 | 329 | |
| 330 | 330 | // Decrypt and retrieve data in JSON format |
| 331 | 331 | $dataReceived = prepareExchangedData($post_data, 'decode'); |
@@ -376,25 +376,25 @@ discard block |
||
| 376 | 376 | // Check KEY |
| 377 | 377 | |
| 378 | 378 | if ($post_key !== $_SESSION['key']) { |
| 379 | - echo prepareExchangedData( |
|
| 380 | - [ |
|
| 381 | - 'error' => true, |
|
| 382 | - 'message' => langHdl('key_is_not_correct'), |
|
| 383 | - ], |
|
| 384 | - 'encode' |
|
| 385 | - ); |
|
| 386 | - break; |
|
| 387 | - } |
|
| 388 | - if ($_SESSION['is_admin'] === false) { |
|
| 389 | - echo prepareExchangedData( |
|
| 390 | - [ |
|
| 391 | - 'error' => true, |
|
| 392 | - 'message' => langHdl('error_not_allowed_to'), |
|
| 393 | - ], |
|
| 394 | - 'encode' |
|
| 395 | - ); |
|
| 396 | - break; |
|
| 397 | - } |
|
| 379 | + echo prepareExchangedData( |
|
| 380 | + [ |
|
| 381 | + 'error' => true, |
|
| 382 | + 'message' => langHdl('key_is_not_correct'), |
|
| 383 | + ], |
|
| 384 | + 'encode' |
|
| 385 | + ); |
|
| 386 | + break; |
|
| 387 | + } |
|
| 388 | + if ($_SESSION['is_admin'] === false) { |
|
| 389 | + echo prepareExchangedData( |
|
| 390 | + [ |
|
| 391 | + 'error' => true, |
|
| 392 | + 'message' => langHdl('error_not_allowed_to'), |
|
| 393 | + ], |
|
| 394 | + 'encode' |
|
| 395 | + ); |
|
| 396 | + break; |
|
| 397 | + } |
|
| 398 | 398 | |
| 399 | 399 | // Decrypt and retrieve data in JSON format |
| 400 | 400 | $dataReceived = prepareExchangedData($post_data, 'decode'); |
@@ -466,25 +466,25 @@ discard block |
||
| 466 | 466 | // Check KEY |
| 467 | 467 | |
| 468 | 468 | if ($post_key !== $_SESSION['key']) { |
| 469 | - echo prepareExchangedData( |
|
| 470 | - [ |
|
| 471 | - 'error' => true, |
|
| 472 | - 'message' => langHdl('key_is_not_correct'), |
|
| 473 | - ], |
|
| 474 | - 'encode' |
|
| 475 | - ); |
|
| 476 | - break; |
|
| 477 | - } |
|
| 478 | - if ($_SESSION['is_admin'] === false) { |
|
| 479 | - echo prepareExchangedData( |
|
| 480 | - [ |
|
| 481 | - 'error' => true, |
|
| 482 | - 'message' => langHdl('error_not_allowed_to'), |
|
| 483 | - ], |
|
| 484 | - 'encode' |
|
| 485 | - ); |
|
| 486 | - break; |
|
| 487 | - } |
|
| 469 | + echo prepareExchangedData( |
|
| 470 | + [ |
|
| 471 | + 'error' => true, |
|
| 472 | + 'message' => langHdl('key_is_not_correct'), |
|
| 473 | + ], |
|
| 474 | + 'encode' |
|
| 475 | + ); |
|
| 476 | + break; |
|
| 477 | + } |
|
| 478 | + if ($_SESSION['is_admin'] === false) { |
|
| 479 | + echo prepareExchangedData( |
|
| 480 | + [ |
|
| 481 | + 'error' => true, |
|
| 482 | + 'message' => langHdl('error_not_allowed_to'), |
|
| 483 | + ], |
|
| 484 | + 'encode' |
|
| 485 | + ); |
|
| 486 | + break; |
|
| 487 | + } |
|
| 488 | 488 | |
| 489 | 489 | // Decrypt and retrieve data in JSON format |
| 490 | 490 | $dataReceived = prepareExchangedData($post_data, 'decode'); |
@@ -586,25 +586,25 @@ discard block |
||
| 586 | 586 | // Check KEY |
| 587 | 587 | |
| 588 | 588 | if ($post_key !== $_SESSION['key']) { |
| 589 | - echo prepareExchangedData( |
|
| 590 | - [ |
|
| 591 | - 'error' => true, |
|
| 592 | - 'message' => langHdl('key_is_not_correct'), |
|
| 593 | - ], |
|
| 594 | - 'encode' |
|
| 595 | - ); |
|
| 596 | - break; |
|
| 597 | - } |
|
| 598 | - if ($_SESSION['is_admin'] === false) { |
|
| 599 | - echo prepareExchangedData( |
|
| 600 | - [ |
|
| 601 | - 'error' => true, |
|
| 602 | - 'message' => langHdl('error_not_allowed_to'), |
|
| 603 | - ], |
|
| 604 | - 'encode' |
|
| 605 | - ); |
|
| 606 | - break; |
|
| 607 | - } |
|
| 589 | + echo prepareExchangedData( |
|
| 590 | + [ |
|
| 591 | + 'error' => true, |
|
| 592 | + 'message' => langHdl('key_is_not_correct'), |
|
| 593 | + ], |
|
| 594 | + 'encode' |
|
| 595 | + ); |
|
| 596 | + break; |
|
| 597 | + } |
|
| 598 | + if ($_SESSION['is_admin'] === false) { |
|
| 599 | + echo prepareExchangedData( |
|
| 600 | + [ |
|
| 601 | + 'error' => true, |
|
| 602 | + 'message' => langHdl('error_not_allowed_to'), |
|
| 603 | + ], |
|
| 604 | + 'encode' |
|
| 605 | + ); |
|
| 606 | + break; |
|
| 607 | + } |
|
| 608 | 608 | |
| 609 | 609 | // Decrypt and retrieve data in JSON format |
| 610 | 610 | $dataReceived = prepareExchangedData($post_data, 'decode'); |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | /* do checks */ |
| 53 | 53 | require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
| 54 | 54 | require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
| 55 | -if (! checkUser($_SESSION['user_id'], $_SESSION['key'], 'options', $SETTINGS)) { |
|
| 55 | +if (!checkUser($_SESSION['user_id'], $_SESSION['key'], 'options', $SETTINGS)) { |
|
| 56 | 56 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 57 | 57 | //not allowed page |
| 58 | 58 | include $SETTINGS['cpassman_dir'].'/error.php'; |
@@ -497,8 +497,7 @@ discard block |
||
| 497 | 497 | $post_masked = filter_var($dataReceived['masked'], FILTER_SANITIZE_STRING); |
| 498 | 498 | $post_encrypted = filter_var($dataReceived['encrypted'], FILTER_SANITIZE_STRING); |
| 499 | 499 | $post_roles = filter_var_array($dataReceived['roles'], FILTER_SANITIZE_STRING); |
| 500 | -$post_fieldId = isset($dataReceived['fieldId']) === false ? '' : |
|
| 501 | - filter_var($dataReceived['fieldId'], FILTER_SANITIZE_NUMBER_INT); |
|
| 500 | +$post_fieldId = isset($dataReceived['fieldId']) === false ? '' : filter_var($dataReceived['fieldId'], FILTER_SANITIZE_NUMBER_INT); |
|
| 502 | 501 | if (empty($post_fieldId) === false) { |
| 503 | 502 | // UPDATE FIELD |
| 504 | 503 | |
@@ -617,8 +616,7 @@ discard block |
||
| 617 | 616 | $post_masked = filter_var($dataReceived['masked'], FILTER_SANITIZE_STRING); |
| 618 | 617 | $post_encrypted = filter_var($dataReceived['encrypted'], FILTER_SANITIZE_STRING); |
| 619 | 618 | $post_roles = filter_var_array($dataReceived['roles'], FILTER_SANITIZE_STRING); |
| 620 | -$post_fieldId = isset($dataReceived['fieldId']) === false ? '' : |
|
| 621 | - filter_var($dataReceived['fieldId'], FILTER_SANITIZE_NUMBER_INT); |
|
| 619 | +$post_fieldId = isset($dataReceived['fieldId']) === false ? '' : filter_var($dataReceived['fieldId'], FILTER_SANITIZE_NUMBER_INT); |
|
| 622 | 620 | // NEW FIELD |
| 623 | 621 | DB::insert( |
| 624 | 622 | prefixTable('categories'), |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | require_once 'SecureHandler.php'; |
| 29 | 29 | session_name('teampass_session'); |
| 30 | 30 | session_start(); |
| 31 | -if (! isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || ! isset($_SESSION['key']) || empty($_SESSION['key'])) { |
|
| 31 | +if (!isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || !isset($_SESSION['key']) || empty($_SESSION['key'])) { |
|
| 32 | 32 | die('Hacking attempt...'); |
| 33 | 33 | } |
| 34 | 34 | |
@@ -42,17 +42,17 @@ discard block |
||
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | // Do checks |
| 45 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 46 | -require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php'; |
|
| 45 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 46 | +require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
|
| 47 | 47 | if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'items', $SETTINGS) === false) { |
| 48 | 48 | // Not allowed page |
| 49 | 49 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 50 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 50 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 51 | 51 | exit; |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php'; |
|
| 55 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 54 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php'; |
|
| 55 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 56 | 56 | header('Content-type: text/html; charset=utf-8'); |
| 57 | 57 | header('Cache-Control: no-cache, must-revalidate'); |
| 58 | 58 | require_once 'main.functions.php'; |
@@ -60,12 +60,12 @@ discard block |
||
| 60 | 60 | if (isset($_SESSION['groupes_visibles']) === false |
| 61 | 61 | || empty($_SESSION['groupes_visibles']) === true |
| 62 | 62 | ) { |
| 63 | - echo '{"sEcho": ' . intval($_GET['sEcho']) . ' ,"iTotalRecords": "0", "iTotalDisplayRecords": "0", "aaData": [] }'; |
|
| 63 | + echo '{"sEcho": '.intval($_GET['sEcho']).' ,"iTotalRecords": "0", "iTotalDisplayRecords": "0", "aaData": [] }'; |
|
| 64 | 64 | exit; |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | //Connect to DB |
| 68 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 68 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 69 | 69 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 70 | 70 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 71 | 71 | } |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | $folders = $_SESSION['groupes_visibles']; |
| 90 | 90 | } else { |
| 91 | 91 | // Build tree |
| 92 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 92 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 93 | 93 | $tree->register(); |
| 94 | 94 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 95 | 95 | $folders = $tree->getDescendants(filter_var($_GET['limited'], FILTER_SANITIZE_NUMBER_INT), true); |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | |
| 99 | 99 | //Get current user "personal folder" ID |
| 100 | 100 | $row = DB::query( |
| 101 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE title = %i', |
|
| 101 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE title = %i', |
|
| 102 | 102 | intval($_SESSION['user_id']) |
| 103 | 103 | ); |
| 104 | 104 | //get list of personal folders |
@@ -107,21 +107,21 @@ discard block |
||
| 107 | 107 | $listPf = ''; |
| 108 | 108 | if (empty($row['id']) === false) { |
| 109 | 109 | $rows = DB::query( |
| 110 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 110 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 111 | 111 | WHERE personal_folder = 1 AND NOT parent_id = %i AND NOT title = %i', |
| 112 | 112 | '1', |
| 113 | 113 | filter_var($row['id'], FILTER_SANITIZE_NUMBER_INT), |
| 114 | 114 | filter_var($_SESSION['user_id'], FILTER_SANITIZE_NUMBER_INT) |
| 115 | 115 | ); |
| 116 | 116 | foreach ($rows as $record) { |
| 117 | - if (! in_array($record['id'], $arrayPf)) { |
|
| 117 | + if (!in_array($record['id'], $arrayPf)) { |
|
| 118 | 118 | //build an array of personal folders ids |
| 119 | 119 | array_push($arrayPf, $record['id']); |
| 120 | 120 | //build also a string with those ids |
| 121 | 121 | if (empty($listPf)) { |
| 122 | 122 | $listPf = $record['id']; |
| 123 | 123 | } else { |
| 124 | - $listPf .= ', ' . $record['id']; |
|
| 124 | + $listPf .= ', '.$record['id']; |
|
| 125 | 125 | } |
| 126 | 126 | } |
| 127 | 127 | } |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | //Paging |
| 132 | 132 | $sLimit = ''; |
| 133 | 133 | if (isset($_GET['start']) === true && $_GET['length'] !== '-1') { |
| 134 | - $sLimit = 'LIMIT ' . filter_var($_GET['start'], FILTER_SANITIZE_NUMBER_INT) . ', ' . filter_var($_GET['length'], FILTER_SANITIZE_NUMBER_INT) . ''; |
|
| 134 | + $sLimit = 'LIMIT '.filter_var($_GET['start'], FILTER_SANITIZE_NUMBER_INT).', '.filter_var($_GET['length'], FILTER_SANITIZE_NUMBER_INT).''; |
|
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | //Ordering |
@@ -144,8 +144,8 @@ discard block |
||
| 144 | 144 | } |
| 145 | 145 | $sOrder = 'ORDER BY '; |
| 146 | 146 | if ($_GET['order'][0]['column'] >= 0) { |
| 147 | - $sOrder .= '' . $aColumns[filter_var($_GET['order'][0]['column'], FILTER_SANITIZE_NUMBER_INT)] . ' ' |
|
| 148 | - . filter_var($_GET['order'][0]['dir'], FILTER_SANITIZE_STRING) . ', '; |
|
| 147 | + $sOrder .= ''.$aColumns[filter_var($_GET['order'][0]['column'], FILTER_SANITIZE_NUMBER_INT)].' ' |
|
| 148 | + . filter_var($_GET['order'][0]['dir'], FILTER_SANITIZE_STRING).', '; |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | $sOrder = substr_replace($sOrder, '', -2); |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | $sOrder = ''; |
| 154 | 154 | } |
| 155 | 155 | } else { |
| 156 | - $sOrder = 'ORDER BY ' . $aColumns[1] . ' ASC'; |
|
| 156 | + $sOrder = 'ORDER BY '.$aColumns[1].' ASC'; |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | // Define criteria |
@@ -175,9 +175,9 @@ discard block |
||
| 175 | 175 | if (empty($search_criteria) === false) { |
| 176 | 176 | $sWhere .= ' AND ('; |
| 177 | 177 | for ($i = 0; $i < count($aColumns); ++$i) { |
| 178 | - $sWhere .= $aColumns[$i] . ' LIKE %ss_' . $i . ' OR '; |
|
| 178 | + $sWhere .= $aColumns[$i].' LIKE %ss_'.$i.' OR '; |
|
| 179 | 179 | } |
| 180 | - $sWhere = substr_replace((string) $sWhere, '', -3) . ') '; |
|
| 180 | + $sWhere = substr_replace((string) $sWhere, '', -3).') '; |
|
| 181 | 181 | $crit = [ |
| 182 | 182 | 'idtree' => array_unique($folders), |
| 183 | 183 | '0' => $search_criteria, |
@@ -215,13 +215,13 @@ discard block |
||
| 215 | 215 | if (empty($sWhere) === false) { |
| 216 | 216 | $sWhere .= ' AND '; |
| 217 | 217 | } |
| 218 | - $sWhere = 'WHERE ' . $sWhere . 'id_tree NOT IN %ls_pf '; |
|
| 218 | + $sWhere = 'WHERE '.$sWhere.'id_tree NOT IN %ls_pf '; |
|
| 219 | 219 | } else { |
| 220 | - $sWhere = 'WHERE ' . $sWhere; |
|
| 220 | + $sWhere = 'WHERE '.$sWhere; |
|
| 221 | 221 | } |
| 222 | 222 | |
| 223 | 223 | DB::query( |
| 224 | - 'SELECT id FROM ' . prefixTable('cache') . " |
|
| 224 | + 'SELECT id FROM '.prefixTable('cache')." |
|
| 225 | 225 | ${sWhere} |
| 226 | 226 | ${sOrder}", |
| 227 | 227 | $crit |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | $iTotal = DB::count(); |
| 230 | 230 | $rows = DB::query( |
| 231 | 231 | 'SELECT id, label, description, tags, id_tree, perso, restricted_to, login, folder, author, renewal_period, url, timestamp |
| 232 | - FROM ' . prefixTable('cache') . " |
|
| 232 | + FROM ' . prefixTable('cache')." |
|
| 233 | 233 | ${sWhere} |
| 234 | 234 | ${sOrder} |
| 235 | 235 | ${sLimit}", |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | if (isset($_GET['type']) === false) { |
| 244 | 244 | $sOutput = '{'; |
| 245 | 245 | if (isset($_GET['draw']) === true) { |
| 246 | - $sOutput .= '"draw": ' . intval($_GET['draw']) . ', '; |
|
| 246 | + $sOutput .= '"draw": '.intval($_GET['draw']).', '; |
|
| 247 | 247 | } |
| 248 | 248 | $sOutput .= '"data": ['; |
| 249 | 249 | $sOutputConst = ''; |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | $arrTmp = []; |
| 260 | 260 | foreach (explode(';', $_SESSION['fonction_id']) as $role) { |
| 261 | 261 | $access = DB::queryFirstRow( |
| 262 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
| 262 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
| 263 | 263 | $role, |
| 264 | 264 | $record['id_tree'] |
| 265 | 265 | ); |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | } |
| 278 | 278 | $accessLevel = count($arrTmp) > 0 ? min($arrTmp) : $accessLevel; |
| 279 | 279 | if ($accessLevel === 0) { |
| 280 | - $checkbox = '<input type=\"checkbox\" value=\"0\" class=\"mass_op_cb\" data-id=\"' . $record['id'] . '\">'; |
|
| 280 | + $checkbox = '<input type=\"checkbox\" value=\"0\" class=\"mass_op_cb\" data-id=\"'.$record['id'].'\">'; |
|
| 281 | 281 | } |
| 282 | 282 | |
| 283 | 283 | if ((int) $accessLevel === 0) { |
@@ -317,22 +317,22 @@ discard block |
||
| 317 | 317 | if (empty($restrictedTo)) { |
| 318 | 318 | $restrictedTo = $_SESSION['user_id']; |
| 319 | 319 | } else { |
| 320 | - $restrictedTo .= ',' . $_SESSION['user_id']; |
|
| 320 | + $restrictedTo .= ','.$_SESSION['user_id']; |
|
| 321 | 321 | } |
| 322 | 322 | } |
| 323 | 323 | |
| 324 | 324 | //col1 |
| 325 | - $sOutputItem .= '"<i class=\"fa fa-external-link-alt infotip mr-2\" title=\"' . langHdl('open_url_link') . '\" onClick=\"window.location.href='index.php?page=items&group=' . $record['id_tree'] . '&id=' . $record['id'] . ''\" style=\"cursor:pointer;\"></i>' . |
|
| 326 | - '<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 . '", '; |
|
| 325 | + $sOutputItem .= '"<i class=\"fa fa-external-link-alt infotip mr-2\" title=\"'.langHdl('open_url_link').'\" onClick=\"window.location.href='index.php?page=items&group='.$record['id_tree'].'&id='.$record['id'].''\" style=\"cursor:pointer;\"></i>'. |
|
| 326 | + '<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.'", '; |
|
| 327 | 327 | //col2 |
| 328 | - $sOutputItem .= '"<span id=\"item_label-' . $record['id'] . '\">' . stripslashes($record['label']) . '</span>", '; |
|
| 328 | + $sOutputItem .= '"<span id=\"item_label-'.$record['id'].'\">'.stripslashes($record['label']).'</span>", '; |
|
| 329 | 329 | //col3 |
| 330 | - $sOutputItem .= '"' . str_replace('&', '&', htmlspecialchars(stripslashes($record['login']), ENT_QUOTES)) . '", '; |
|
| 330 | + $sOutputItem .= '"'.str_replace('&', '&', htmlspecialchars(stripslashes($record['login']), ENT_QUOTES)).'", '; |
|
| 331 | 331 | //col4 |
| 332 | 332 | //get restriction from ROles |
| 333 | 333 | $restrictedToRole = false; |
| 334 | 334 | $rTmp = DB::queryFirstColumn( |
| 335 | - 'SELECT role_id FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', |
|
| 335 | + 'SELECT role_id FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', |
|
| 336 | 336 | $record['id'] |
| 337 | 337 | ); |
| 338 | 338 | // We considere here that if user has at least one group similar to the object ones |
@@ -350,14 +350,14 @@ discard block |
||
| 350 | 350 | } else { |
| 351 | 351 | $txt = str_replace(['\n', '<br />', '\\'], [' ', ' ', '', ' '], strip_tags($record['description'])); |
| 352 | 352 | if (strlen($txt) > 50) { |
| 353 | - $sOutputItem .= '"' . substr(stripslashes(preg_replace('~/<[\/]{0,1}[^>]*>\//|[ \t]/~', '', $txt)), 0, 50) . '", '; |
|
| 353 | + $sOutputItem .= '"'.substr(stripslashes(preg_replace('~/<[\/]{0,1}[^>]*>\//|[ \t]/~', '', $txt)), 0, 50).'", '; |
|
| 354 | 354 | } else { |
| 355 | - $sOutputItem .= '"' . stripslashes(preg_replace('~/<[^>]*>|[ \t]/~', '', $txt)) . '", '; |
|
| 355 | + $sOutputItem .= '"'.stripslashes(preg_replace('~/<[^>]*>|[ \t]/~', '', $txt)).'", '; |
|
| 356 | 356 | } |
| 357 | 357 | } |
| 358 | 358 | |
| 359 | 359 | //col5 - TAGS |
| 360 | - $sOutputItem .= '"' . htmlspecialchars(stripslashes($record['tags']), ENT_QUOTES) . '", '; |
|
| 360 | + $sOutputItem .= '"'.htmlspecialchars(stripslashes($record['tags']), ENT_QUOTES).'", '; |
|
| 361 | 361 | // col6 - URL |
| 362 | 362 | if ($record['url'] !== '0') { |
| 363 | 363 | $sOutputItem .= '"'.filter_var($record['url'], FILTER_SANITIZE_URL).'", '; |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | } |
| 367 | 367 | |
| 368 | 368 | //col7 - Prepare the Treegrid |
| 369 | - $sOutputItem .= '"' . htmlspecialchars(stripslashes($record['folder']), ENT_QUOTES) . '"'; |
|
| 369 | + $sOutputItem .= '"'.htmlspecialchars(stripslashes($record['folder']), ENT_QUOTES).'"'; |
|
| 370 | 370 | //Finish the line |
| 371 | 371 | $sOutputItem .= '], '; |
| 372 | 372 | if ($getItemInList === true) { |
@@ -376,16 +376,16 @@ discard block |
||
| 376 | 376 | --$iTotal; |
| 377 | 377 | } |
| 378 | 378 | } |
| 379 | - if (! empty($sOutputConst)) { |
|
| 379 | + if (!empty($sOutputConst)) { |
|
| 380 | 380 | $sOutput .= substr_replace($sOutputConst, '', -2); |
| 381 | 381 | } |
| 382 | 382 | $sOutput .= '], '; |
| 383 | - $sOutput .= '"recordsTotal": ' . $iTotal . ', '; |
|
| 384 | - $sOutput .= '"recordsFiltered": ' . $iTotal . ' }'; |
|
| 383 | + $sOutput .= '"recordsTotal": '.$iTotal.', '; |
|
| 384 | + $sOutput .= '"recordsFiltered": '.$iTotal.' }'; |
|
| 385 | 385 | echo $sOutput; |
| 386 | 386 | } elseif (isset($_GET['type']) && ($_GET['type'] === 'search_for_items' || $_GET['type'] === 'search_for_items_with_tags')) { |
| 387 | 387 | include_once 'main.functions.php'; |
| 388 | - include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php'; |
|
| 388 | + include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php'; |
|
| 389 | 389 | $sOutput = ''; |
| 390 | 390 | $init_personal_folder = false; |
| 391 | 391 | $arr_data = []; |
@@ -406,7 +406,7 @@ discard block |
||
| 406 | 406 | |
| 407 | 407 | // Anyone can modify? |
| 408 | 408 | $tmp = DB::queryfirstrow( |
| 409 | - 'SELECT anyone_can_modify FROM ' . prefixTable('items') . ' WHERE id = %i', |
|
| 409 | + 'SELECT anyone_can_modify FROM '.prefixTable('items').' WHERE id = %i', |
|
| 410 | 410 | $record['id'] |
| 411 | 411 | ); |
| 412 | 412 | if (count($tmp) > 0) { |
@@ -438,7 +438,7 @@ discard block |
||
| 438 | 438 | // => récupérer un tableau contenant les roles associés à cet ID (a partir table restriction_to_roles) |
| 439 | 439 | $user_is_included_in_role = 0; |
| 440 | 440 | $roles = DB::query( |
| 441 | - 'SELECT role_id FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id=%i', |
|
| 441 | + 'SELECT role_id FROM '.prefixTable('restriction_to_roles').' WHERE item_id=%i', |
|
| 442 | 442 | $record['id'] |
| 443 | 443 | ); |
| 444 | 444 | if (count($roles) > 0) { |
@@ -461,7 +461,7 @@ discard block |
||
| 461 | 461 | if (empty($restrictedTo)) { |
| 462 | 462 | $restrictedTo = $_SESSION['user_id']; |
| 463 | 463 | } else { |
| 464 | - $restrictedTo .= ',' . $_SESSION['user_id']; |
|
| 464 | + $restrictedTo .= ','.$_SESSION['user_id']; |
|
| 465 | 465 | } |
| 466 | 466 | } |
| 467 | 467 | |
@@ -469,7 +469,7 @@ discard block |
||
| 469 | 469 | // Get log for this item |
| 470 | 470 | $logs = DB::query( |
| 471 | 471 | 'SELECT * |
| 472 | - FROM ' . prefixTable('log_items') . ' |
|
| 472 | + FROM ' . prefixTable('log_items').' |
|
| 473 | 473 | WHERE id_item = %i AND action = %s AND id_user = %i', |
| 474 | 474 | $record['id'], |
| 475 | 475 | 'at_creation', |
@@ -568,7 +568,7 @@ discard block |
||
| 568 | 568 | $arrTmp = []; |
| 569 | 569 | foreach (explode(';', $_SESSION['fonction_id']) as $role) { |
| 570 | 570 | $access = DB::queryFirstRow( |
| 571 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
| 571 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
| 572 | 572 | $role, |
| 573 | 573 | $record['id_tree'] |
| 574 | 574 | ); |
@@ -617,8 +617,8 @@ discard block |
||
| 617 | 617 | ) { |
| 618 | 618 | $data_item = DB::queryFirstRow( |
| 619 | 619 | 'SELECT i.pw AS pw, s.share_key AS share_key |
| 620 | - FROM ' . prefixTable('items') . ' AS i |
|
| 621 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
| 620 | + FROM ' . prefixTable('items').' AS i |
|
| 621 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
| 622 | 622 | WHERE i.id = %i AND s.user_id = %i', |
| 623 | 623 | $record['id'], |
| 624 | 624 | $_SESSION['user_id'] |
@@ -47,11 +47,11 @@ discard block |
||
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | // includes |
| 50 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 51 | -require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 52 | -require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 53 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php'; |
|
| 54 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 50 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 51 | +require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 52 | +require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 53 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php'; |
|
| 54 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 55 | 55 | // header |
| 56 | 56 | header('Content-type: text/html; charset=utf-8'); |
| 57 | 57 | header('Cache-Control: no-cache, must-revalidate'); |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | // Connect to mysql server |
| 66 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 66 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 67 | 67 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 68 | 68 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 69 | 69 | } |
@@ -74,13 +74,13 @@ discard block |
||
| 74 | 74 | DB::$port = DB_PORT; |
| 75 | 75 | DB::$encoding = DB_ENCODING; |
| 76 | 76 | // Superglobal load |
| 77 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 77 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 78 | 78 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 79 | 79 | $session_user_admin = $superGlobal->get('user_admin', 'GET'); |
| 80 | 80 | $sessionTreeStructure = $superGlobal->get('user_tree_structure', 'GET'); |
| 81 | 81 | $sessionLastTreeRefresh = $superGlobal->get('user_tree_last_refresh_timestamp', 'GET'); |
| 82 | 82 | $lastFolderChange = DB::query( |
| 83 | - 'SELECT * FROM ' . prefixTable('misc') . ' |
|
| 83 | + 'SELECT * FROM '.prefixTable('misc').' |
|
| 84 | 84 | WHERE type = %s AND intitule = %s', |
| 85 | 85 | 'timestamp', |
| 86 | 86 | 'last_folder_change' |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | || (isset($_GET['force_refresh']) === true && (int) $_GET['force_refresh'] === 1) |
| 92 | 92 | ) { |
| 93 | 93 | // Build tree |
| 94 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 94 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 95 | 95 | $tree->register(); |
| 96 | 96 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 97 | 97 | if ( |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | array $SETTINGS |
| 188 | 188 | ): array { |
| 189 | 189 | // Load library |
| 190 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 190 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 191 | 191 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 192 | 192 | // Prepare superGlobal variables |
| 193 | 193 | $session_forbiden_pfs = $superGlobal->get('forbiden_pfs', 'SESSION'); |
@@ -236,7 +236,7 @@ discard block |
||
| 236 | 236 | // get count of Items in this folder |
| 237 | 237 | DB::query( |
| 238 | 238 | 'SELECT * |
| 239 | - FROM ' . prefixTable('items') . ' |
|
| 239 | + FROM ' . prefixTable('items').' |
|
| 240 | 240 | WHERE inactif=%i AND id_tree = %i', |
| 241 | 241 | 0, |
| 242 | 242 | $node->id |
@@ -245,54 +245,50 @@ discard block |
||
| 245 | 245 | // get info about current folder |
| 246 | 246 | DB::query( |
| 247 | 247 | 'SELECT * |
| 248 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 248 | + FROM ' . prefixTable('nested_tree').' |
|
| 249 | 249 | WHERE parent_id = %i', |
| 250 | 250 | $node->id |
| 251 | 251 | ); |
| 252 | 252 | $childrenNb = DB::count(); |
| 253 | 253 | // If personal Folder, convert id into user name |
| 254 | 254 | $node->title = $node->title === $session_user_id && (int) $node->nlevel === 1 ? |
| 255 | - $session_login : |
|
| 256 | - ($node->title === null ? '' : htmlspecialchars_decode($node->title, ENT_QUOTES)); |
|
| 255 | + $session_login : ($node->title === null ? '' : htmlspecialchars_decode($node->title, ENT_QUOTES)); |
|
| 257 | 256 | // prepare json return for current node |
| 258 | - $parent = $node->parent_id === 0 ? '#' : 'li_' . $node->parent_id; |
|
| 257 | + $parent = $node->parent_id === 0 ? '#' : 'li_'.$node->parent_id; |
|
| 259 | 258 | // special case for READ-ONLY folder |
| 260 | - $title = $session_user_read_only === true && ! in_array($node->id, $session_personal_folders) ? langHdl('read_only_account') : $title; |
|
| 259 | + $title = $session_user_read_only === true && !in_array($node->id, $session_personal_folders) ? langHdl('read_only_account') : $title; |
|
| 261 | 260 | $text .= str_replace('&', '&', $node->title); |
| 262 | 261 | $restricted = '0'; |
| 263 | 262 | $folderClass = 'folder'; |
| 264 | 263 | if (in_array($node->id, $session_groupes_visibles)) { |
| 265 | 264 | if (in_array($node->id, $session_read_only_folders)) { |
| 266 | - $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text; |
|
| 265 | + $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text; |
|
| 267 | 266 | $title = langHdl('read_only_account'); |
| 268 | 267 | $restricted = 1; |
| 269 | 268 | $folderClass = 'folder_not_droppable'; |
| 270 | - } elseif ($session_user_read_only === true && ! in_array($node->id, $session_personal_visible_groups)) { |
|
| 271 | - $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text; |
|
| 269 | + } elseif ($session_user_read_only === true && !in_array($node->id, $session_personal_visible_groups)) { |
|
| 270 | + $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text; |
|
| 272 | 271 | } |
| 273 | 272 | $text .= |
| 274 | - ' <span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_' . $node->id . '\'>' . $itemsNb . '</span>' |
|
| 273 | + ' <span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_'.$node->id.'\'>'.$itemsNb.'</span>' |
|
| 275 | 274 | .(isset($SETTINGS['tree_counters']) && $SETTINGS['tree_counters'] === 1 ? |
| 276 | - '/'.$nbChildrenItems . |
|
| 277 | - '/'.(count($nodeDescendants) - 1) : |
|
| 278 | - '') |
|
| 275 | + '/'.$nbChildrenItems. |
|
| 276 | + '/'.(count($nodeDescendants) - 1) : '') |
|
| 279 | 277 | .'</span>'; |
| 280 | 278 | } elseif (in_array($node->id, $listFoldersLimitedKeys)) { |
| 281 | 279 | $restricted = '1'; |
| 282 | 280 | $text .= |
| 283 | 281 | $session_user_read_only === true ? |
| 284 | - "<i class='far fa-eye fa-xs mr-1'></i>" : |
|
| 285 | - '' |
|
| 286 | - .'<span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_' . $node->id . '\'>' . count($session_list_folders_limited[$node->id]) . '</span>'; |
|
| 282 | + "<i class='far fa-eye fa-xs mr-1'></i>" : '' |
|
| 283 | + .'<span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_'.$node->id.'\'>'.count($session_list_folders_limited[$node->id]).'</span>'; |
|
| 287 | 284 | } elseif (in_array($node->id, $listRestrictedFoldersForItemsKeys)) { |
| 288 | 285 | $restricted = '1'; |
| 289 | 286 | if ($session_user_read_only === true) { |
| 290 | - $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text; |
|
| 287 | + $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text; |
|
| 291 | 288 | } |
| 292 | 289 | $text .= $session_user_read_only === true ? |
| 293 | - "<i class='far fa-eye fa-xs mr-1'></i>" : |
|
| 294 | - '' |
|
| 295 | - . '<span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_' . $node->id . '\'>' . count($session_list_restricted_folders_for_items[$node->id]) . '</span>'; |
|
| 290 | + "<i class='far fa-eye fa-xs mr-1'></i>" : '' |
|
| 291 | + . '<span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_'.$node->id.'\'>'.count($session_list_restricted_folders_for_items[$node->id]).'</span>'; |
|
| 296 | 292 | } else { |
| 297 | 293 | $restricted = '1'; |
| 298 | 294 | $folderClass = 'folder_not_droppable'; |
@@ -318,18 +314,18 @@ discard block |
||
| 318 | 314 | array_push( |
| 319 | 315 | $ret_json, |
| 320 | 316 | [ |
| 321 | - 'id' => 'li_' . $node->id, |
|
| 317 | + 'id' => 'li_'.$node->id, |
|
| 322 | 318 | 'parent' => $parent, |
| 323 | 319 | 'text' => $text, |
| 324 | 320 | 'children' => $childrenNb === 0 ? false : true, |
| 325 | 321 | 'li_attr' => [ |
| 326 | 322 | 'class' => 'jstreeopen', |
| 327 | - 'title' => 'ID [' . $node->id . '] ' . $title, |
|
| 323 | + 'title' => 'ID ['.$node->id.'] '.$title, |
|
| 328 | 324 | ], |
| 329 | 325 | 'a_attr' => [ |
| 330 | - 'id' => 'fld_' . $node->id, |
|
| 326 | + 'id' => 'fld_'.$node->id, |
|
| 331 | 327 | 'class' => $folderClass, |
| 332 | - 'onclick' => 'ListerItems(' . $node->id . ', ' . $restricted . ', 0, 1)', |
|
| 328 | + 'onclick' => 'ListerItems('.$node->id.', '.$restricted.', 0, 1)', |
|
| 333 | 329 | 'data-title' => $node->title, |
| 334 | 330 | ], |
| 335 | 331 | ] |
@@ -338,13 +334,13 @@ discard block |
||
| 338 | 334 | array_push( |
| 339 | 335 | $ret_json, |
| 340 | 336 | [ |
| 341 | - 'id' => 'li_' . $node->id, |
|
| 337 | + 'id' => 'li_'.$node->id, |
|
| 342 | 338 | 'parent' => $parent, |
| 343 | 339 | 'children' => $childrenNb === 0 ? false : true, |
| 344 | - 'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>' . $text, |
|
| 340 | + 'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>'.$text, |
|
| 345 | 341 | 'li_attr' => [ |
| 346 | 342 | 'class' => '', |
| 347 | - 'title' => 'ID [' . $node->id . '] ' . langHdl('no_access'), |
|
| 343 | + 'title' => 'ID ['.$node->id.'] '.langHdl('no_access'), |
|
| 348 | 344 | ], |
| 349 | 345 | ] |
| 350 | 346 | ); |
@@ -394,7 +390,7 @@ discard block |
||
| 394 | 390 | } |
| 395 | 391 | |
| 396 | 392 | // Load library |
| 397 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 393 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 398 | 394 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 399 | 395 | // Prepare superGlobal variables |
| 400 | 396 | $session_forbiden_pfs = $superGlobal->get('forbiden_pfs', 'SESSION'); |
@@ -427,7 +423,7 @@ discard block |
||
| 427 | 423 | ) === true |
| 428 | 424 | ) { |
| 429 | 425 | DB::query( |
| 430 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 426 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 431 | 427 | WHERE inactif=%i AND id_tree = %i', |
| 432 | 428 | 0, |
| 433 | 429 | $node |
@@ -457,7 +453,7 @@ discard block |
||
| 457 | 453 | if ($displayThisNode === true) { |
| 458 | 454 | // get info about current folder |
| 459 | 455 | DB::query( |
| 460 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 456 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 461 | 457 | WHERE inactif=%i AND id_tree = %i', |
| 462 | 458 | 0, |
| 463 | 459 | $completTree[$nodeId]->id |
@@ -482,7 +478,7 @@ discard block |
||
| 482 | 478 | $folderClass = 'folder'; |
| 483 | 479 | if (in_array($completTree[$nodeId]->id, $session_groupes_visibles) === true) { |
| 484 | 480 | if (in_array($completTree[$nodeId]->id, $session_read_only_folders) === true) { |
| 485 | - $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text; |
|
| 481 | + $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text; |
|
| 486 | 482 | $title = langHdl('read_only_account'); |
| 487 | 483 | $restricted = 1; |
| 488 | 484 | $folderClass = 'folder_not_droppable'; |
@@ -490,27 +486,26 @@ discard block |
||
| 490 | 486 | $session_user_read_only === true |
| 491 | 487 | && in_array($completTree[$nodeId]->id, $session_personal_visible_groups) === false |
| 492 | 488 | ) { |
| 493 | - $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text; |
|
| 489 | + $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text; |
|
| 494 | 490 | } |
| 495 | 491 | $text .= |
| 496 | - '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_' . $completTree[$nodeId]->id . '\'>' . $itemsNb . |
|
| 492 | + '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_'.$completTree[$nodeId]->id.'\'>'.$itemsNb. |
|
| 497 | 493 | (isset($SETTINGS['tree_counters']) === true && (int) $SETTINGS['tree_counters'] === 1 ? |
| 498 | - '/'.$nbChildrenItems . |
|
| 499 | - '/'.(count($nodeDescendants) - 1) : |
|
| 500 | - '') |
|
| 494 | + '/'.$nbChildrenItems. |
|
| 495 | + '/'.(count($nodeDescendants) - 1) : '') |
|
| 501 | 496 | . '</span>'; |
| 502 | 497 | } elseif (in_array($completTree[$nodeId]->id, $listFoldersLimitedKeys) === true) { |
| 503 | 498 | $restricted = '1'; |
| 504 | 499 | if ($session_user_read_only === true) { |
| 505 | - $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text; |
|
| 500 | + $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text; |
|
| 506 | 501 | } |
| 507 | - $text .= '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_' . $completTree[$nodeId]->id . '\'>' . count($session_list_folders_limited[$completTree[$nodeId]->id]); |
|
| 502 | + $text .= '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_'.$completTree[$nodeId]->id.'\'>'.count($session_list_folders_limited[$completTree[$nodeId]->id]); |
|
| 508 | 503 | } elseif (in_array($completTree[$nodeId]->id, $listRestrictedFoldersForItemsKeys) === true) { |
| 509 | 504 | $restricted = '1'; |
| 510 | 505 | if ($session_user_read_only === true) { |
| 511 | - $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text; |
|
| 506 | + $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text; |
|
| 512 | 507 | } |
| 513 | - $text .= '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_' . $completTree[$nodeId]->id . '\'>' . count($session_list_restricted_folders_for_items[$completTree[$nodeId]->id]) . '</span>'; |
|
| 508 | + $text .= '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_'.$completTree[$nodeId]->id.'\'>'.count($session_list_restricted_folders_for_items[$completTree[$nodeId]->id]).'</span>'; |
|
| 514 | 509 | } else { |
| 515 | 510 | $restricted = '1'; |
| 516 | 511 | $folderClass = 'folder_not_droppable'; |
@@ -547,7 +542,7 @@ discard block |
||
| 547 | 542 | } |
| 548 | 543 | |
| 549 | 544 | // prepare json return for current node |
| 550 | - $parent = $completTree[$nodeId]->parent_id === '0' ? '#' : 'li_' . $completTree[$nodeId]->parent_id; |
|
| 545 | + $parent = $completTree[$nodeId]->parent_id === '0' ? '#' : 'li_'.$completTree[$nodeId]->parent_id; |
|
| 551 | 546 | // handle displaying |
| 552 | 547 | if ( |
| 553 | 548 | isset($SETTINGS['show_only_accessible_folders']) === true |
@@ -566,17 +561,17 @@ discard block |
||
| 566 | 561 | array_push( |
| 567 | 562 | $ret_json, |
| 568 | 563 | [ |
| 569 | - 'id' => 'li_' . $completTree[$nodeId]->id, |
|
| 564 | + 'id' => 'li_'.$completTree[$nodeId]->id, |
|
| 570 | 565 | 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent, |
| 571 | 566 | 'text' => $text, |
| 572 | 567 | 'li_attr' => [ |
| 573 | 568 | 'class' => 'jstreeopen', |
| 574 | - 'title' => 'ID [' . $completTree[$nodeId]->id . '] ' . $title, |
|
| 569 | + 'title' => 'ID ['.$completTree[$nodeId]->id.'] '.$title, |
|
| 575 | 570 | ], |
| 576 | 571 | 'a_attr' => [ |
| 577 | - 'id' => 'fld_' . $completTree[$nodeId]->id, |
|
| 572 | + 'id' => 'fld_'.$completTree[$nodeId]->id, |
|
| 578 | 573 | 'class' => $folderClass, |
| 579 | - 'onclick' => 'ListerItems(' . $completTree[$nodeId]->id . ', ' . $restricted . ', 0, 1)', |
|
| 574 | + 'onclick' => 'ListerItems('.$completTree[$nodeId]->id.', '.$restricted.', 0, 1)', |
|
| 580 | 575 | 'data-title' => $completTree[$nodeId]->title, |
| 581 | 576 | ], |
| 582 | 577 | ] |
@@ -585,12 +580,12 @@ discard block |
||
| 585 | 580 | array_push( |
| 586 | 581 | $ret_json, |
| 587 | 582 | [ |
| 588 | - 'id' => 'li_' . $completTree[$nodeId]->id, |
|
| 583 | + 'id' => 'li_'.$completTree[$nodeId]->id, |
|
| 589 | 584 | 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent, |
| 590 | - 'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>' . $text, |
|
| 585 | + 'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>'.$text, |
|
| 591 | 586 | 'li_attr' => [ |
| 592 | 587 | 'class' => '', |
| 593 | - 'title' => 'ID [' . $completTree[$nodeId]->id . '] ' . langHdl('no_access'), |
|
| 588 | + 'title' => 'ID ['.$completTree[$nodeId]->id.'] '.langHdl('no_access'), |
|
| 594 | 589 | ], |
| 595 | 590 | ] |
| 596 | 591 | ); |
@@ -81,9 +81,9 @@ |
||
| 81 | 81 | // Decrypt and retreive data in JSON format |
| 82 | 82 | |
| 83 | 83 | $dataReceived = prepareExchangedData( |
| 84 | - $post_data, |
|
| 85 | - 'decode' |
|
| 86 | - ); |
|
| 84 | + $post_data, |
|
| 85 | + 'decode' |
|
| 86 | + ); |
|
| 87 | 87 | $post_user_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT); |
| 88 | 88 | $post_user_pwd = filter_var($dataReceived['user_pwd'], FILTER_SANITIZE_STRING); |
| 89 | 89 | // Get user info |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | require_once 'SecureHandler.php'; |
| 29 | 29 | session_name('teampass_session'); |
| 30 | 30 | session_start(); |
| 31 | -if (! isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || ! isset($_SESSION['key']) || empty($_SESSION['key'])) { |
|
| 31 | +if (!isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || !isset($_SESSION['key']) || empty($_SESSION['key'])) { |
|
| 32 | 32 | die('Hacking attempt...'); |
| 33 | 33 | } |
| 34 | 34 | |
@@ -42,12 +42,12 @@ discard block |
||
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | // Do checks |
| 45 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 46 | -require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php'; |
|
| 45 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 46 | +require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
|
| 47 | 47 | if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'items', $SETTINGS) === false) { |
| 48 | 48 | // Not allowed page |
| 49 | 49 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 50 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 50 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 51 | 51 | exit; |
| 52 | 52 | } |
| 53 | 53 | |
@@ -60,13 +60,13 @@ discard block |
||
| 60 | 60 | date_default_timezone_set('UTC'); |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php'; |
|
| 64 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 63 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php'; |
|
| 64 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 65 | 65 | header('Content-type: text/html; charset=utf-8'); |
| 66 | 66 | header('Cache-Control: no-cache, must-revalidate'); |
| 67 | 67 | require_once 'main.functions.php'; |
| 68 | 68 | // Connect to mysql server |
| 69 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 69 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 70 | 70 | $link = mysqli_connect(DB_HOST, DB_USER, defuseReturnDecrypted(DB_PASSWD, $SETTINGS), DB_NAME, (int) DB_PORT, null); |
| 71 | 71 | // Protect POST |
| 72 | 72 | $post_type = filter_input(INPUT_POST, 'type', FILTER_SANITIZE_STRING); |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | // Get user info |
| 90 | 90 | $userInfo = DB::queryFirstRow( |
| 91 | 91 | 'SELECT id, public_key, private_key |
| 92 | - FROM ' . prefixTable('users') . ' |
|
| 92 | + FROM ' . prefixTable('users').' |
|
| 93 | 93 | WHERE id = %i', |
| 94 | 94 | $post_user_id |
| 95 | 95 | ); |
@@ -90,25 +90,25 @@ discard block |
||
| 90 | 90 | // Check KEY |
| 91 | 91 | |
| 92 | 92 | if ($post_key !== $_SESSION['key']) { |
| 93 | - echo prepareExchangedData( |
|
| 94 | - [ |
|
| 95 | - 'error' => true, |
|
| 96 | - 'message' => langHdl('key_is_not_correct'), |
|
| 97 | - ], |
|
| 98 | - 'encode' |
|
| 99 | - ); |
|
| 100 | - break; |
|
| 101 | - } |
|
| 102 | - if ($_SESSION['user_read_only'] === true) { |
|
| 103 | - echo prepareExchangedData( |
|
| 104 | - [ |
|
| 105 | - 'error' => true, |
|
| 106 | - 'message' => langHdl('error_not_allowed_to'), |
|
| 107 | - ], |
|
| 108 | - 'encode' |
|
| 109 | - ); |
|
| 110 | - break; |
|
| 111 | - } |
|
| 93 | + echo prepareExchangedData( |
|
| 94 | + [ |
|
| 95 | + 'error' => true, |
|
| 96 | + 'message' => langHdl('key_is_not_correct'), |
|
| 97 | + ], |
|
| 98 | + 'encode' |
|
| 99 | + ); |
|
| 100 | + break; |
|
| 101 | + } |
|
| 102 | + if ($_SESSION['user_read_only'] === true) { |
|
| 103 | + echo prepareExchangedData( |
|
| 104 | + [ |
|
| 105 | + 'error' => true, |
|
| 106 | + 'message' => langHdl('error_not_allowed_to'), |
|
| 107 | + ], |
|
| 108 | + 'encode' |
|
| 109 | + ); |
|
| 110 | + break; |
|
| 111 | + } |
|
| 112 | 112 | |
| 113 | 113 | // Get list of deleted FOLDERS |
| 114 | 114 | $arrFolders = []; |
@@ -186,25 +186,25 @@ discard block |
||
| 186 | 186 | // Check KEY |
| 187 | 187 | |
| 188 | 188 | if ($post_key !== $_SESSION['key']) { |
| 189 | - echo prepareExchangedData( |
|
| 190 | - [ |
|
| 191 | - 'error' => true, |
|
| 192 | - 'message' => langHdl('key_is_not_correct'), |
|
| 193 | - ], |
|
| 194 | - 'encode' |
|
| 195 | - ); |
|
| 196 | - break; |
|
| 197 | - } |
|
| 198 | - if ($_SESSION['user_read_only'] === true) { |
|
| 199 | - echo prepareExchangedData( |
|
| 200 | - [ |
|
| 201 | - 'error' => true, |
|
| 202 | - 'message' => langHdl('error_not_allowed_to'), |
|
| 203 | - ], |
|
| 204 | - 'encode' |
|
| 205 | - ); |
|
| 206 | - break; |
|
| 207 | - } |
|
| 189 | + echo prepareExchangedData( |
|
| 190 | + [ |
|
| 191 | + 'error' => true, |
|
| 192 | + 'message' => langHdl('key_is_not_correct'), |
|
| 193 | + ], |
|
| 194 | + 'encode' |
|
| 195 | + ); |
|
| 196 | + break; |
|
| 197 | + } |
|
| 198 | + if ($_SESSION['user_read_only'] === true) { |
|
| 199 | + echo prepareExchangedData( |
|
| 200 | + [ |
|
| 201 | + 'error' => true, |
|
| 202 | + 'message' => langHdl('error_not_allowed_to'), |
|
| 203 | + ], |
|
| 204 | + 'encode' |
|
| 205 | + ); |
|
| 206 | + break; |
|
| 207 | + } |
|
| 208 | 208 | |
| 209 | 209 | // decrypt and retrieve data in JSON format |
| 210 | 210 | $dataReceived = prepareExchangedData($post_data, 'decode'); |
@@ -312,25 +312,25 @@ discard block |
||
| 312 | 312 | // Check KEY |
| 313 | 313 | |
| 314 | 314 | if ($post_key !== $_SESSION['key']) { |
| 315 | - echo prepareExchangedData( |
|
| 316 | - [ |
|
| 317 | - 'error' => true, |
|
| 318 | - 'message' => langHdl('key_is_not_correct'), |
|
| 319 | - ], |
|
| 320 | - 'encode' |
|
| 321 | - ); |
|
| 322 | - break; |
|
| 323 | - } |
|
| 324 | - if ($_SESSION['user_read_only'] === true) { |
|
| 325 | - echo prepareExchangedData( |
|
| 326 | - [ |
|
| 327 | - 'error' => true, |
|
| 328 | - 'message' => langHdl('error_not_allowed_to'), |
|
| 329 | - ], |
|
| 330 | - 'encode' |
|
| 331 | - ); |
|
| 332 | - break; |
|
| 333 | - } |
|
| 315 | + echo prepareExchangedData( |
|
| 316 | + [ |
|
| 317 | + 'error' => true, |
|
| 318 | + 'message' => langHdl('key_is_not_correct'), |
|
| 319 | + ], |
|
| 320 | + 'encode' |
|
| 321 | + ); |
|
| 322 | + break; |
|
| 323 | + } |
|
| 324 | + if ($_SESSION['user_read_only'] === true) { |
|
| 325 | + echo prepareExchangedData( |
|
| 326 | + [ |
|
| 327 | + 'error' => true, |
|
| 328 | + 'message' => langHdl('error_not_allowed_to'), |
|
| 329 | + ], |
|
| 330 | + 'encode' |
|
| 331 | + ); |
|
| 332 | + break; |
|
| 333 | + } |
|
| 334 | 334 | |
| 335 | 335 | // decrypt and retrieve data in JSON format |
| 336 | 336 | $dataReceived = prepareExchangedData($post_data, 'decode'); |
@@ -434,25 +434,25 @@ discard block |
||
| 434 | 434 | // Check KEY |
| 435 | 435 | |
| 436 | 436 | if ($post_key !== $_SESSION['key']) { |
| 437 | - echo prepareExchangedData( |
|
| 438 | - [ |
|
| 439 | - 'error' => true, |
|
| 440 | - 'message' => langHdl('key_is_not_correct'), |
|
| 441 | - ], |
|
| 442 | - 'encode' |
|
| 443 | - ); |
|
| 444 | - break; |
|
| 445 | - } |
|
| 446 | - if ($_SESSION['user_read_only'] === true) { |
|
| 447 | - echo prepareExchangedData( |
|
| 448 | - [ |
|
| 449 | - 'error' => true, |
|
| 450 | - 'message' => langHdl('error_not_allowed_to'), |
|
| 451 | - ], |
|
| 452 | - 'encode' |
|
| 453 | - ); |
|
| 454 | - break; |
|
| 455 | - } |
|
| 437 | + echo prepareExchangedData( |
|
| 438 | + [ |
|
| 439 | + 'error' => true, |
|
| 440 | + 'message' => langHdl('key_is_not_correct'), |
|
| 441 | + ], |
|
| 442 | + 'encode' |
|
| 443 | + ); |
|
| 444 | + break; |
|
| 445 | + } |
|
| 446 | + if ($_SESSION['user_read_only'] === true) { |
|
| 447 | + echo prepareExchangedData( |
|
| 448 | + [ |
|
| 449 | + 'error' => true, |
|
| 450 | + 'message' => langHdl('error_not_allowed_to'), |
|
| 451 | + ], |
|
| 452 | + 'encode' |
|
| 453 | + ); |
|
| 454 | + break; |
|
| 455 | + } |
|
| 456 | 456 | |
| 457 | 457 | // decrypt and retrieve data in JSON format |
| 458 | 458 | $dataReceived = prepareExchangedData($post_data, 'decode'); |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | require_once 'SecureHandler.php'; |
| 29 | 29 | session_name('teampass_session'); |
| 30 | 30 | session_start(); |
| 31 | -if (! isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || ! isset($_SESSION['key']) || empty($_SESSION['key'])) { |
|
| 31 | +if (!isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || !isset($_SESSION['key']) || empty($_SESSION['key'])) { |
|
| 32 | 32 | die('Hacking attempt...'); |
| 33 | 33 | } |
| 34 | 34 | |
@@ -42,12 +42,12 @@ discard block |
||
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | // Do checks |
| 45 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 46 | -require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php'; |
|
| 45 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 46 | +require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
|
| 47 | 47 | if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'utilities.database', $SETTINGS) === false) { |
| 48 | 48 | // Not allowed page |
| 49 | 49 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 50 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 50 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 51 | 51 | exit; |
| 52 | 52 | } |
| 53 | 53 | |
@@ -60,13 +60,13 @@ discard block |
||
| 60 | 60 | date_default_timezone_set('UTC'); |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php'; |
|
| 64 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 63 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php'; |
|
| 64 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 65 | 65 | header('Content-type: text/html; charset=utf-8'); |
| 66 | 66 | header('Cache-Control: no-cache, must-revalidate'); |
| 67 | 67 | require_once 'main.functions.php'; |
| 68 | 68 | //Connect to DB |
| 69 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 69 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 70 | 70 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 71 | 71 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 72 | 72 | } |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | $arrFolders = []; |
| 115 | 115 | $rows = DB::query( |
| 116 | 116 | 'SELECT valeur, intitule |
| 117 | - FROM ' . prefixTable('misc') . ' |
|
| 117 | + FROM ' . prefixTable('misc').' |
|
| 118 | 118 | WHERE type = %s', |
| 119 | 119 | 'folder_deleted' |
| 120 | 120 | ); |
@@ -135,10 +135,10 @@ discard block |
||
| 135 | 135 | 'SELECT u.login as login, u.name as name, u.lastname as lastname, |
| 136 | 136 | i.id as id, i.label as label, |
| 137 | 137 | i.id_tree as id_tree, l.date as date, n.title as folder_title |
| 138 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 139 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
| 140 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 141 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree=n.id) |
|
| 138 | + FROM ' . prefixTable('log_items').' as l |
|
| 139 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
| 140 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 141 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree=n.id) |
|
| 142 | 142 | WHERE i.inactif = %i |
| 143 | 143 | AND l.action = %s', |
| 144 | 144 | 1, |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | 'label' => $record['label'], |
| 161 | 161 | 'date' => date($SETTINGS['date_format'], $record['date']), |
| 162 | 162 | 'login' => $record['login'], |
| 163 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
| 163 | + 'name' => $record['name'].' '.$record['lastname'], |
|
| 164 | 164 | 'folder_label' => $record['folder_title'], |
| 165 | 165 | 'folder_deleted' => $thisFolder, |
| 166 | 166 | ] |
@@ -215,10 +215,10 @@ discard block |
||
| 215 | 215 | foreach ($post_folders as $folderId) { |
| 216 | 216 | $data = DB::queryfirstrow( |
| 217 | 217 | 'SELECT valeur |
| 218 | - FROM ' . prefixTable('misc') . " |
|
| 218 | + FROM ' . prefixTable('misc')." |
|
| 219 | 219 | WHERE type = 'folder_deleted' |
| 220 | 220 | AND intitule = %s", |
| 221 | - 'f' . $folderId |
|
| 221 | + 'f'.$folderId |
|
| 222 | 222 | ); |
| 223 | 223 | if ((int) $data['valeur'] !== 0) { |
| 224 | 224 | $folderData = explode(', ', $data['valeur']); |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | prefixTable('misc'), |
| 244 | 244 | 'type = %s AND intitule = %s', |
| 245 | 245 | 'folder_deleted', |
| 246 | - 'f' . $folderId |
|
| 246 | + 'f'.$folderId |
|
| 247 | 247 | ); |
| 248 | 248 | // Restore all items in this folder |
| 249 | 249 | DB::update( |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | // Get list of all items in thos folder |
| 258 | 258 | $items = DB::query( |
| 259 | 259 | 'SELECT id |
| 260 | - FROM ' . prefixTable('items') . ' |
|
| 260 | + FROM ' . prefixTable('items').' |
|
| 261 | 261 | WHERE id_tree = %i', |
| 262 | 262 | $folderId |
| 263 | 263 | ); |
@@ -341,10 +341,10 @@ discard block |
||
| 341 | 341 | foreach ($post_folders as $folderId) { |
| 342 | 342 | $data = DB::queryfirstrow( |
| 343 | 343 | 'SELECT valeur |
| 344 | - FROM ' . prefixTable('misc') . " |
|
| 344 | + FROM ' . prefixTable('misc')." |
|
| 345 | 345 | WHERE type = 'folder_deleted' |
| 346 | 346 | AND intitule = %s", |
| 347 | - 'f' . $folderId |
|
| 347 | + 'f'.$folderId |
|
| 348 | 348 | ); |
| 349 | 349 | if ((int) $data['valeur'] !== 0) { |
| 350 | 350 | $folderData = explode(', ', $data['valeur']); |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | prefixTable('misc'), |
| 376 | 376 | 'type = %s AND intitule = %s', |
| 377 | 377 | 'folder_deleted', |
| 378 | - 'f' . $folderData[0] |
|
| 378 | + 'f'.$folderData[0] |
|
| 379 | 379 | ); |
| 380 | 380 | // Delete all items in this folder |
| 381 | 381 | DB::delete( |
@@ -387,7 +387,7 @@ discard block |
||
| 387 | 387 | // Get list of all items in thos folder |
| 388 | 388 | $items = DB::query( |
| 389 | 389 | 'SELECT id |
| 390 | - FROM ' . prefixTable('items') . ' |
|
| 390 | + FROM ' . prefixTable('items').' |
|
| 391 | 391 | WHERE id_tree = %i', |
| 392 | 392 | $folderData[0] |
| 393 | 393 | ); |
@@ -481,7 +481,7 @@ discard block |
||
| 481 | 481 | ) { |
| 482 | 482 | if ($post_log_type === 'items') { |
| 483 | 483 | DB::query( |
| 484 | - 'SELECT * FROM ' . prefixTable('log_items') . ' |
|
| 484 | + 'SELECT * FROM '.prefixTable('log_items').' |
|
| 485 | 485 | WHERE action=%s ' . 'AND date BETWEEN %i AND %i' |
| 486 | 486 | . ($post_filter_action === 'all' ? '' : ' AND action = %s') |
| 487 | 487 | . ($post_filter_user === -1 ? '' : ' AND id_user = %i'), |
@@ -503,7 +503,7 @@ discard block |
||
| 503 | 503 | } elseif ($post_log_type === 'connections') { |
| 504 | 504 | db::debugmode(true); |
| 505 | 505 | DB::query( |
| 506 | - 'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' . |
|
| 506 | + 'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '. |
|
| 507 | 507 | 'AND date BETWEEN %i AND %i', |
| 508 | 508 | 'user_connection', |
| 509 | 509 | $post_date_from, |
@@ -520,7 +520,7 @@ discard block |
||
| 520 | 520 | ); |
| 521 | 521 | } elseif ($post_log_type === 'errors') { |
| 522 | 522 | DB::query( |
| 523 | - 'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' . |
|
| 523 | + 'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '. |
|
| 524 | 524 | 'AND date BETWEEN %i AND %i', |
| 525 | 525 | 'error', |
| 526 | 526 | $post_date_from, |
@@ -537,7 +537,7 @@ discard block |
||
| 537 | 537 | ); |
| 538 | 538 | } elseif ($post_log_type === 'copy') { |
| 539 | 539 | DB::query( |
| 540 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE action=%s ' . |
|
| 540 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE action=%s '. |
|
| 541 | 541 | 'AND date BETWEEN %i AND %i', |
| 542 | 542 | 'at_copy', |
| 543 | 543 | $post_date_from, |
@@ -554,7 +554,7 @@ discard block |
||
| 554 | 554 | ); |
| 555 | 555 | } elseif ($post_log_type === 'admin') { |
| 556 | 556 | DB::query( |
| 557 | - 'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' . |
|
| 557 | + 'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '. |
|
| 558 | 558 | 'AND date BETWEEN %i AND %i', |
| 559 | 559 | 'admin_action', |
| 560 | 560 | $post_date_from, |
@@ -571,7 +571,7 @@ discard block |
||
| 571 | 571 | ); |
| 572 | 572 | } elseif ($post_log_type === 'failed') { |
| 573 | 573 | DB::query( |
| 574 | - 'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' . |
|
| 574 | + 'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '. |
|
| 575 | 575 | 'AND date BETWEEN %i AND %i', |
| 576 | 576 | 'failed_auth', |
| 577 | 577 | $post_date_from, |
@@ -116,24 +116,24 @@ discard block |
||
| 116 | 116 | */ |
| 117 | 117 | function cryption(string $message, string $ascii_key, string $type, array $SETTINGS): array |
| 118 | 118 | { |
| 119 | - $ascii_key = empty($ascii_key) === true ? file_get_contents(SECUREPATH . '/teampass-seckey.txt') : $ascii_key; |
|
| 119 | + $ascii_key = empty($ascii_key) === true ? file_get_contents(SECUREPATH.'/teampass-seckey.txt') : $ascii_key; |
|
| 120 | 120 | $err = false; |
| 121 | 121 | // load PhpEncryption library |
| 122 | 122 | if (isset($SETTINGS['cpassman_dir']) === false || empty($SETTINGS['cpassman_dir']) === true) { |
| 123 | 123 | $path = '../includes/libraries/Encryption/Encryption/'; |
| 124 | 124 | } else { |
| 125 | - $path = $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/'; |
|
| 126 | - } |
|
| 127 | - |
|
| 128 | - include_once $path . 'Crypto.php'; |
|
| 129 | - include_once $path . 'Encoding.php'; |
|
| 130 | - include_once $path . 'DerivedKeys.php'; |
|
| 131 | - include_once $path . 'Key.php'; |
|
| 132 | - include_once $path . 'KeyOrPassword.php'; |
|
| 133 | - include_once $path . 'File.php'; |
|
| 134 | - include_once $path . 'RuntimeTests.php'; |
|
| 135 | - include_once $path . 'KeyProtectedByPassword.php'; |
|
| 136 | - include_once $path . 'Core.php'; |
|
| 125 | + $path = $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/'; |
|
| 126 | + } |
|
| 127 | + |
|
| 128 | + include_once $path.'Crypto.php'; |
|
| 129 | + include_once $path.'Encoding.php'; |
|
| 130 | + include_once $path.'DerivedKeys.php'; |
|
| 131 | + include_once $path.'Key.php'; |
|
| 132 | + include_once $path.'KeyOrPassword.php'; |
|
| 133 | + include_once $path.'File.php'; |
|
| 134 | + include_once $path.'RuntimeTests.php'; |
|
| 135 | + include_once $path.'KeyProtectedByPassword.php'; |
|
| 136 | + include_once $path.'Core.php'; |
|
| 137 | 137 | // convert KEY |
| 138 | 138 | $key = \Defuse\Crypto\Key::loadFromAsciiSafeString($ascii_key); |
| 139 | 139 | try { |
@@ -175,15 +175,15 @@ discard block |
||
| 175 | 175 | $path = '../includes/libraries/Encryption/Encryption/'; |
| 176 | 176 | } |
| 177 | 177 | |
| 178 | - include_once $path . 'Crypto.php'; |
|
| 179 | - include_once $path . 'Encoding.php'; |
|
| 180 | - include_once $path . 'DerivedKeys.php'; |
|
| 181 | - include_once $path . 'Key.php'; |
|
| 182 | - include_once $path . 'KeyOrPassword.php'; |
|
| 183 | - include_once $path . 'File.php'; |
|
| 184 | - include_once $path . 'RuntimeTests.php'; |
|
| 185 | - include_once $path . 'KeyProtectedByPassword.php'; |
|
| 186 | - include_once $path . 'Core.php'; |
|
| 178 | + include_once $path.'Crypto.php'; |
|
| 179 | + include_once $path.'Encoding.php'; |
|
| 180 | + include_once $path.'DerivedKeys.php'; |
|
| 181 | + include_once $path.'Key.php'; |
|
| 182 | + include_once $path.'KeyOrPassword.php'; |
|
| 183 | + include_once $path.'File.php'; |
|
| 184 | + include_once $path.'RuntimeTests.php'; |
|
| 185 | + include_once $path.'KeyProtectedByPassword.php'; |
|
| 186 | + include_once $path.'Core.php'; |
|
| 187 | 187 | $key = \Defuse\Crypto\Key::createNewRandomKey(); |
| 188 | 188 | $key = $key->saveToAsciiSafeString(); |
| 189 | 189 | return $key; |
@@ -205,15 +205,15 @@ discard block |
||
| 205 | 205 | $path = '../includes/libraries/Encryption/Encryption/'; |
| 206 | 206 | } |
| 207 | 207 | |
| 208 | - include_once $path . 'Crypto.php'; |
|
| 209 | - include_once $path . 'Encoding.php'; |
|
| 210 | - include_once $path . 'DerivedKeys.php'; |
|
| 211 | - include_once $path . 'Key.php'; |
|
| 212 | - include_once $path . 'KeyOrPassword.php'; |
|
| 213 | - include_once $path . 'File.php'; |
|
| 214 | - include_once $path . 'RuntimeTests.php'; |
|
| 215 | - include_once $path . 'KeyProtectedByPassword.php'; |
|
| 216 | - include_once $path . 'Core.php'; |
|
| 208 | + include_once $path.'Crypto.php'; |
|
| 209 | + include_once $path.'Encoding.php'; |
|
| 210 | + include_once $path.'DerivedKeys.php'; |
|
| 211 | + include_once $path.'Key.php'; |
|
| 212 | + include_once $path.'KeyOrPassword.php'; |
|
| 213 | + include_once $path.'File.php'; |
|
| 214 | + include_once $path.'RuntimeTests.php'; |
|
| 215 | + include_once $path.'KeyProtectedByPassword.php'; |
|
| 216 | + include_once $path.'Core.php'; |
|
| 217 | 217 | $protected_key = \Defuse\Crypto\KeyProtectedByPassword::createRandomPasswordProtectedKey($psk); |
| 218 | 218 | return $protected_key->saveToAsciiSafeString(); // save this in user table |
| 219 | 219 | } |
@@ -235,15 +235,15 @@ discard block |
||
| 235 | 235 | $path = '../includes/libraries/Encryption/Encryption/'; |
| 236 | 236 | } |
| 237 | 237 | |
| 238 | - include_once $path . 'Crypto.php'; |
|
| 239 | - include_once $path . 'Encoding.php'; |
|
| 240 | - include_once $path . 'DerivedKeys.php'; |
|
| 241 | - include_once $path . 'Key.php'; |
|
| 242 | - include_once $path . 'KeyOrPassword.php'; |
|
| 243 | - include_once $path . 'File.php'; |
|
| 244 | - include_once $path . 'RuntimeTests.php'; |
|
| 245 | - include_once $path . 'KeyProtectedByPassword.php'; |
|
| 246 | - include_once $path . 'Core.php'; |
|
| 238 | + include_once $path.'Crypto.php'; |
|
| 239 | + include_once $path.'Encoding.php'; |
|
| 240 | + include_once $path.'DerivedKeys.php'; |
|
| 241 | + include_once $path.'Key.php'; |
|
| 242 | + include_once $path.'KeyOrPassword.php'; |
|
| 243 | + include_once $path.'File.php'; |
|
| 244 | + include_once $path.'RuntimeTests.php'; |
|
| 245 | + include_once $path.'KeyProtectedByPassword.php'; |
|
| 246 | + include_once $path.'Core.php'; |
|
| 247 | 247 | try { |
| 248 | 248 | $protected_key = \Defuse\Crypto\KeyProtectedByPassword::loadFromAsciiSafeString($protected_key_encoded); |
| 249 | 249 | $user_key = $protected_key->unlockKey($psk); |
@@ -280,9 +280,9 @@ discard block |
||
| 280 | 280 | * @param string|array $chaine what to trim |
| 281 | 281 | * @param string $element trim on what |
| 282 | 282 | */ |
| 283 | -function trimElement(string|array $chaine, string $element): string |
|
| 283 | +function trimElement(string | array $chaine, string $element): string |
|
| 284 | 284 | { |
| 285 | - if (! empty($chaine)) { |
|
| 285 | + if (!empty($chaine)) { |
|
| 286 | 286 | if (is_array($chaine) === true) { |
| 287 | 287 | $chaine = implode(';', $chaine); |
| 288 | 288 | } |
@@ -326,8 +326,8 @@ discard block |
||
| 326 | 326 | */ |
| 327 | 327 | function db_error_handler(array $params): void |
| 328 | 328 | { |
| 329 | - echo 'Error: ' . $params['error'] . "<br>\n"; |
|
| 330 | - echo 'Query: ' . $params['query'] . "<br>\n"; |
|
| 329 | + echo 'Error: '.$params['error']."<br>\n"; |
|
| 330 | + echo 'Query: '.$params['query']."<br>\n"; |
|
| 331 | 331 | throw new Exception('Error - Query', 1); |
| 332 | 332 | } |
| 333 | 333 | |
@@ -349,12 +349,12 @@ discard block |
||
| 349 | 349 | $SETTINGS |
| 350 | 350 | ): string { |
| 351 | 351 | //load ClassLoader |
| 352 | - include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 352 | + include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 353 | 353 | // Load superglobal |
| 354 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 354 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 355 | 355 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 356 | 356 | //Connect to DB |
| 357 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 357 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 358 | 358 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 359 | 359 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 360 | 360 | } |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | DB::$port = DB_PORT; |
| 366 | 366 | DB::$encoding = DB_ENCODING; |
| 367 | 367 | //Build tree |
| 368 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 368 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 369 | 369 | $tree->register(); |
| 370 | 370 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 371 | 371 | // Check if user is ADMINISTRATOR |
@@ -406,7 +406,7 @@ discard block |
||
| 406 | 406 | function identAdmin(string $idFonctions, array $SETTINGS, array $tree): void |
| 407 | 407 | { |
| 408 | 408 | // Load superglobal |
| 409 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 409 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 410 | 410 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 411 | 411 | // Init |
| 412 | 412 | $groupesVisibles = []; |
@@ -425,7 +425,7 @@ discard block |
||
| 425 | 425 | $globalsVisibleFolders = $superGlobal->get('groupes_visibles', 'SESSION'); |
| 426 | 426 | $globalsPersonalVisibleFolders = $superGlobal->get('personal_visible_groups', 'SESSION'); |
| 427 | 427 | // Get list of Folders |
| 428 | - $rows = DB::query('SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', 0); |
|
| 428 | + $rows = DB::query('SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', 0); |
|
| 429 | 429 | foreach ($rows as $record) { |
| 430 | 430 | array_push($groupesVisibles, $record['id']); |
| 431 | 431 | } |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | } |
| 445 | 445 | // Get ID of personal folder |
| 446 | 446 | $persfld = DB::queryfirstrow( |
| 447 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', |
|
| 447 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE title = %s', |
|
| 448 | 448 | $globalsUserId |
| 449 | 449 | ); |
| 450 | 450 | if (empty($persfld['id']) === false) { |
@@ -465,20 +465,20 @@ discard block |
||
| 465 | 465 | // get complete list of ROLES |
| 466 | 466 | $tmp = explode(';', $idFonctions); |
| 467 | 467 | $rows = DB::query( |
| 468 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
| 468 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
| 469 | 469 | ORDER BY title ASC' |
| 470 | 470 | ); |
| 471 | 471 | foreach ($rows as $record) { |
| 472 | - if (! empty($record['id']) && ! in_array($record['id'], $tmp)) { |
|
| 472 | + if (!empty($record['id']) && !in_array($record['id'], $tmp)) { |
|
| 473 | 473 | array_push($tmp, $record['id']); |
| 474 | 474 | } |
| 475 | 475 | } |
| 476 | 476 | $superGlobal->put('fonction_id', implode(';', $tmp), 'SESSION'); |
| 477 | 477 | $superGlobal->put('is_admin', 1, 'SESSION'); |
| 478 | 478 | // Check if admin has created Folders and Roles |
| 479 | - DB::query('SELECT * FROM ' . prefixTable('nested_tree') . ''); |
|
| 479 | + DB::query('SELECT * FROM '.prefixTable('nested_tree').''); |
|
| 480 | 480 | $superGlobal->put('nb_folders', DB::count(), 'SESSION'); |
| 481 | - DB::query('SELECT * FROM ' . prefixTable('roles_title')); |
|
| 481 | + DB::query('SELECT * FROM '.prefixTable('roles_title')); |
|
| 482 | 482 | $superGlobal->put('nb_roles', DB::count(), 'SESSION'); |
| 483 | 483 | } |
| 484 | 484 | |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | * |
| 490 | 490 | * @return array |
| 491 | 491 | */ |
| 492 | -function convertToArray(string|array $element): array |
|
| 492 | +function convertToArray(string | array $element): array |
|
| 493 | 493 | { |
| 494 | 494 | if (is_string($element) === true) { |
| 495 | 495 | if (empty($element) === true) { |
@@ -517,14 +517,14 @@ discard block |
||
| 517 | 517 | * @param object $tree Tree of folders |
| 518 | 518 | */ |
| 519 | 519 | function identUser( |
| 520 | - string|array $allowedFolders, |
|
| 521 | - string|array $noAccessFolders, |
|
| 522 | - string|array $userRoles, |
|
| 520 | + string | array $allowedFolders, |
|
| 521 | + string | array $noAccessFolders, |
|
| 522 | + string | array $userRoles, |
|
| 523 | 523 | array $SETTINGS, |
| 524 | 524 | object $tree |
| 525 | 525 | ) { |
| 526 | 526 | // Load superglobal |
| 527 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 527 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 528 | 528 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 529 | 529 | // Init |
| 530 | 530 | $superGlobal->put('groupes_visibles', [], 'SESSION'); |
@@ -552,7 +552,7 @@ discard block |
||
| 552 | 552 | // Get list of folders depending on Roles |
| 553 | 553 | $rows = DB::query( |
| 554 | 554 | 'SELECT * |
| 555 | - FROM ' . prefixTable('roles_values') . ' |
|
| 555 | + FROM ' . prefixTable('roles_values').' |
|
| 556 | 556 | WHERE role_id IN %li AND type IN %ls', |
| 557 | 557 | $userRoles, |
| 558 | 558 | ['W', 'ND', 'NE', 'NDNE', 'R'] |
@@ -576,9 +576,9 @@ discard block |
||
| 576 | 576 | // Does this user is allowed to see other items |
| 577 | 577 | $inc = 0; |
| 578 | 578 | $rows = DB::query( |
| 579 | - 'SELECT id, id_tree FROM ' . prefixTable('items') . ' |
|
| 579 | + 'SELECT id, id_tree FROM '.prefixTable('items').' |
|
| 580 | 580 | WHERE restricted_to LIKE %ss AND inactif = %s', |
| 581 | - $globalsUserId . ';', |
|
| 581 | + $globalsUserId.';', |
|
| 582 | 582 | '0' |
| 583 | 583 | ); |
| 584 | 584 | foreach ($rows as $record) { |
@@ -592,8 +592,8 @@ discard block |
||
| 592 | 592 | // Check for the users roles if some specific rights exist on items |
| 593 | 593 | $rows = DB::query( |
| 594 | 594 | 'SELECT i.id_tree, r.item_id |
| 595 | - FROM ' . prefixTable('items') . ' as i |
|
| 596 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (r.item_id=i.id) |
|
| 595 | + FROM ' . prefixTable('items').' as i |
|
| 596 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (r.item_id=i.id) |
|
| 597 | 597 | WHERE r.role_id IN %li |
| 598 | 598 | ORDER BY i.id_tree ASC', |
| 599 | 599 | $userRoles |
@@ -614,7 +614,7 @@ discard block |
||
| 614 | 614 | ) { |
| 615 | 615 | $persoFld = DB::queryfirstrow( |
| 616 | 616 | 'SELECT id |
| 617 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 617 | + FROM ' . prefixTable('nested_tree').' |
|
| 618 | 618 | WHERE title = %s AND personal_folder = %i', |
| 619 | 619 | $globalsUserId, |
| 620 | 620 | 1 |
@@ -647,7 +647,7 @@ discard block |
||
| 647 | 647 | } |
| 648 | 648 | $persoFlds = DB::query( |
| 649 | 649 | 'SELECT id |
| 650 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 650 | + FROM ' . prefixTable('nested_tree').' |
|
| 651 | 651 | WHERE %l', |
| 652 | 652 | $where |
| 653 | 653 | ); |
@@ -688,16 +688,16 @@ discard block |
||
| 688 | 688 | 'SESSION' |
| 689 | 689 | ); |
| 690 | 690 | // Folders and Roles numbers |
| 691 | - DB::queryfirstrow('SELECT id FROM ' . prefixTable('nested_tree') . ''); |
|
| 691 | + DB::queryfirstrow('SELECT id FROM '.prefixTable('nested_tree').''); |
|
| 692 | 692 | $superGlobal->put('nb_folders', DB::count(), 'SESSION'); |
| 693 | - DB::queryfirstrow('SELECT id FROM ' . prefixTable('roles_title')); |
|
| 693 | + DB::queryfirstrow('SELECT id FROM '.prefixTable('roles_title')); |
|
| 694 | 694 | $superGlobal->put('nb_roles', DB::count(), 'SESSION'); |
| 695 | 695 | // check if change proposals on User's items |
| 696 | 696 | if (isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1) { |
| 697 | 697 | DB::query( |
| 698 | 698 | 'SELECT * |
| 699 | - FROM ' . prefixTable('items_change') . ' AS c |
|
| 700 | - LEFT JOIN ' . prefixTable('log_items') . ' AS i ON (c.item_id = i.id_item) |
|
| 699 | + FROM ' . prefixTable('items_change').' AS c |
|
| 700 | + LEFT JOIN ' . prefixTable('log_items').' AS i ON (c.item_id = i.id_item) |
|
| 701 | 701 | WHERE i.action = %s AND i.id_user = %i', |
| 702 | 702 | 'at_creation', |
| 703 | 703 | $globalsUserId |
@@ -741,9 +741,9 @@ discard block |
||
| 741 | 741 | */ |
| 742 | 742 | function cacheTableRefresh(array $SETTINGS): void |
| 743 | 743 | { |
| 744 | - include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 744 | + include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 745 | 745 | //Connect to DB |
| 746 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 746 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 747 | 747 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 748 | 748 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 749 | 749 | } |
@@ -758,12 +758,12 @@ discard block |
||
| 758 | 758 | $tree->register(); |
| 759 | 759 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 760 | 760 | // truncate table |
| 761 | - DB::query('TRUNCATE TABLE ' . prefixTable('cache')); |
|
| 761 | + DB::query('TRUNCATE TABLE '.prefixTable('cache')); |
|
| 762 | 762 | // reload date |
| 763 | 763 | $rows = DB::query( |
| 764 | 764 | 'SELECT * |
| 765 | - FROM ' . prefixTable('items') . ' as i |
|
| 766 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 765 | + FROM ' . prefixTable('items').' as i |
|
| 766 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 767 | 767 | AND l.action = %s |
| 768 | 768 | AND i.inactif = %i', |
| 769 | 769 | 'at_creation', |
@@ -775,18 +775,18 @@ discard block |
||
| 775 | 775 | $tags = ''; |
| 776 | 776 | $itemTags = DB::query( |
| 777 | 777 | 'SELECT tag |
| 778 | - FROM ' . prefixTable('tags') . ' |
|
| 778 | + FROM ' . prefixTable('tags').' |
|
| 779 | 779 | WHERE item_id = %i AND tag != ""', |
| 780 | 780 | $record['id'] |
| 781 | 781 | ); |
| 782 | 782 | foreach ($itemTags as $itemTag) { |
| 783 | - $tags .= $itemTag['tag'] . ' '; |
|
| 783 | + $tags .= $itemTag['tag'].' '; |
|
| 784 | 784 | } |
| 785 | 785 | |
| 786 | 786 | // Get renewal period |
| 787 | 787 | $resNT = DB::queryfirstrow( |
| 788 | 788 | 'SELECT renewal_period |
| 789 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 789 | + FROM ' . prefixTable('nested_tree').' |
|
| 790 | 790 | WHERE id = %i', |
| 791 | 791 | $record['id_tree'] |
| 792 | 792 | ); |
@@ -799,7 +799,7 @@ discard block |
||
| 799 | 799 | // Is this a User id? |
| 800 | 800 | $user = DB::queryfirstrow( |
| 801 | 801 | 'SELECT id, login |
| 802 | - FROM ' . prefixTable('users') . ' |
|
| 802 | + FROM ' . prefixTable('users').' |
|
| 803 | 803 | WHERE id = %i', |
| 804 | 804 | $elem->title |
| 805 | 805 | ); |
@@ -817,11 +817,11 @@ discard block |
||
| 817 | 817 | 'id' => $record['id'], |
| 818 | 818 | 'label' => $record['label'], |
| 819 | 819 | 'description' => $record['description'] ?? '', |
| 820 | - 'url' => isset($record['url']) && ! empty($record['url']) ? $record['url'] : '0', |
|
| 820 | + 'url' => isset($record['url']) && !empty($record['url']) ? $record['url'] : '0', |
|
| 821 | 821 | 'tags' => $tags, |
| 822 | 822 | 'id_tree' => $record['id_tree'], |
| 823 | 823 | 'perso' => $record['perso'], |
| 824 | - 'restricted_to' => isset($record['restricted_to']) && ! empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
| 824 | + 'restricted_to' => isset($record['restricted_to']) && !empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
| 825 | 825 | 'login' => $record['login'] ?? '', |
| 826 | 826 | 'folder' => implode(' > ', $folder), |
| 827 | 827 | 'author' => $record['id_user'], |
@@ -841,12 +841,12 @@ discard block |
||
| 841 | 841 | */ |
| 842 | 842 | function cacheTableUpdate(array $SETTINGS, ?string $ident = null): void |
| 843 | 843 | { |
| 844 | - include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 844 | + include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 845 | 845 | // Load superglobal |
| 846 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 846 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 847 | 847 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 848 | 848 | //Connect to DB |
| 849 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 849 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 850 | 850 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 851 | 851 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 852 | 852 | } |
@@ -863,7 +863,7 @@ discard block |
||
| 863 | 863 | // get new value from db |
| 864 | 864 | $data = DB::queryfirstrow( |
| 865 | 865 | 'SELECT label, description, id_tree, perso, restricted_to, login, url |
| 866 | - FROM ' . prefixTable('items') . ' |
|
| 866 | + FROM ' . prefixTable('items').' |
|
| 867 | 867 | WHERE id=%i', |
| 868 | 868 | $ident |
| 869 | 869 | ); |
@@ -871,12 +871,12 @@ discard block |
||
| 871 | 871 | $tags = ''; |
| 872 | 872 | $itemTags = DB::query( |
| 873 | 873 | 'SELECT tag |
| 874 | - FROM ' . prefixTable('tags') . ' |
|
| 874 | + FROM ' . prefixTable('tags').' |
|
| 875 | 875 | WHERE item_id = %i AND tag != ""', |
| 876 | 876 | $ident |
| 877 | 877 | ); |
| 878 | 878 | foreach ($itemTags as $itemTag) { |
| 879 | - $tags .= $itemTag['tag'] . ' '; |
|
| 879 | + $tags .= $itemTag['tag'].' '; |
|
| 880 | 880 | } |
| 881 | 881 | // form id_tree to full foldername |
| 882 | 882 | $folder = []; |
@@ -887,7 +887,7 @@ discard block |
||
| 887 | 887 | // Is this a User id? |
| 888 | 888 | $user = DB::queryfirstrow( |
| 889 | 889 | 'SELECT id, login |
| 890 | - FROM ' . prefixTable('users') . ' |
|
| 890 | + FROM ' . prefixTable('users').' |
|
| 891 | 891 | WHERE id = %i', |
| 892 | 892 | $elem->title |
| 893 | 893 | ); |
@@ -905,10 +905,10 @@ discard block |
||
| 905 | 905 | 'label' => $data['label'], |
| 906 | 906 | 'description' => $data['description'], |
| 907 | 907 | 'tags' => $tags, |
| 908 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
| 908 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
| 909 | 909 | 'id_tree' => $data['id_tree'], |
| 910 | 910 | 'perso' => $data['perso'], |
| 911 | - 'restricted_to' => isset($data['restricted_to']) && ! empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
| 911 | + 'restricted_to' => isset($data['restricted_to']) && !empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
| 912 | 912 | 'login' => $data['login'] ?? '', |
| 913 | 913 | 'folder' => implode(' » ', $folder), |
| 914 | 914 | 'author' => $superGlobal->get('user_id', 'SESSION'), |
@@ -926,14 +926,14 @@ discard block |
||
| 926 | 926 | */ |
| 927 | 927 | function cacheTableAdd(array $SETTINGS, ?string $ident = null): void |
| 928 | 928 | { |
| 929 | - include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 929 | + include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 930 | 930 | // Load superglobal |
| 931 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 931 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 932 | 932 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 933 | 933 | // Get superglobals |
| 934 | 934 | $globalsUserId = $superGlobal->get('user_id', 'SESSION'); |
| 935 | 935 | //Connect to DB |
| 936 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 936 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 937 | 937 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 938 | 938 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 939 | 939 | } |
@@ -950,8 +950,8 @@ discard block |
||
| 950 | 950 | // get new value from db |
| 951 | 951 | $data = DB::queryFirstRow( |
| 952 | 952 | 'SELECT i.label, i.description, i.id_tree as id_tree, i.perso, i.restricted_to, i.id, i.login, i.url, l.date |
| 953 | - FROM ' . prefixTable('items') . ' as i |
|
| 954 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 953 | + FROM ' . prefixTable('items').' as i |
|
| 954 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 955 | 955 | WHERE i.id = %i |
| 956 | 956 | AND l.action = %s', |
| 957 | 957 | $ident, |
@@ -961,12 +961,12 @@ discard block |
||
| 961 | 961 | $tags = ''; |
| 962 | 962 | $itemTags = DB::query( |
| 963 | 963 | 'SELECT tag |
| 964 | - FROM ' . prefixTable('tags') . ' |
|
| 964 | + FROM ' . prefixTable('tags').' |
|
| 965 | 965 | WHERE item_id = %i AND tag != ""', |
| 966 | 966 | $ident |
| 967 | 967 | ); |
| 968 | 968 | foreach ($itemTags as $itemTag) { |
| 969 | - $tags .= $itemTag['tag'] . ' '; |
|
| 969 | + $tags .= $itemTag['tag'].' '; |
|
| 970 | 970 | } |
| 971 | 971 | // form id_tree to full foldername |
| 972 | 972 | $folder = []; |
@@ -977,7 +977,7 @@ discard block |
||
| 977 | 977 | // Is this a User id? |
| 978 | 978 | $user = DB::queryfirstrow( |
| 979 | 979 | 'SELECT id, login |
| 980 | - FROM ' . prefixTable('users') . ' |
|
| 980 | + FROM ' . prefixTable('users').' |
|
| 981 | 981 | WHERE id = %i', |
| 982 | 982 | $elem->title |
| 983 | 983 | ); |
@@ -996,7 +996,7 @@ discard block |
||
| 996 | 996 | 'label' => $data['label'], |
| 997 | 997 | 'description' => $data['description'], |
| 998 | 998 | 'tags' => isset($tags) && empty($tags) === false ? $tags : 'None', |
| 999 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
| 999 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
| 1000 | 1000 | 'id_tree' => $data['id_tree'], |
| 1001 | 1001 | 'perso' => isset($data['perso']) && empty($data['perso']) === false && $data['perso'] !== 'None' ? $data['perso'] : '0', |
| 1002 | 1002 | 'restricted_to' => isset($data['restricted_to']) && empty($data['restricted_to']) === false ? $data['restricted_to'] : '0', |
@@ -1018,52 +1018,52 @@ discard block |
||
| 1018 | 1018 | function getStatisticsData(array $SETTINGS): array |
| 1019 | 1019 | { |
| 1020 | 1020 | DB::query( |
| 1021 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 1021 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 1022 | 1022 | 0 |
| 1023 | 1023 | ); |
| 1024 | 1024 | $counter_folders = DB::count(); |
| 1025 | 1025 | DB::query( |
| 1026 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 1026 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 1027 | 1027 | 1 |
| 1028 | 1028 | ); |
| 1029 | 1029 | $counter_folders_perso = DB::count(); |
| 1030 | 1030 | DB::query( |
| 1031 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
| 1031 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
| 1032 | 1032 | 0 |
| 1033 | 1033 | ); |
| 1034 | 1034 | $counter_items = DB::count(); |
| 1035 | 1035 | DB::query( |
| 1036 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
| 1036 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
| 1037 | 1037 | 1 |
| 1038 | 1038 | ); |
| 1039 | 1039 | $counter_items_perso = DB::count(); |
| 1040 | 1040 | DB::query( |
| 1041 | - 'SELECT id FROM ' . prefixTable('users') . '' |
|
| 1041 | + 'SELECT id FROM '.prefixTable('users').'' |
|
| 1042 | 1042 | ); |
| 1043 | 1043 | $counter_users = DB::count(); |
| 1044 | 1044 | DB::query( |
| 1045 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE admin = %i', |
|
| 1045 | + 'SELECT id FROM '.prefixTable('users').' WHERE admin = %i', |
|
| 1046 | 1046 | 1 |
| 1047 | 1047 | ); |
| 1048 | 1048 | $admins = DB::count(); |
| 1049 | 1049 | DB::query( |
| 1050 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE gestionnaire = %i', |
|
| 1050 | + 'SELECT id FROM '.prefixTable('users').' WHERE gestionnaire = %i', |
|
| 1051 | 1051 | 1 |
| 1052 | 1052 | ); |
| 1053 | 1053 | $managers = DB::count(); |
| 1054 | 1054 | DB::query( |
| 1055 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE read_only = %i', |
|
| 1055 | + 'SELECT id FROM '.prefixTable('users').' WHERE read_only = %i', |
|
| 1056 | 1056 | 1 |
| 1057 | 1057 | ); |
| 1058 | 1058 | $readOnly = DB::count(); |
| 1059 | 1059 | // list the languages |
| 1060 | 1060 | $usedLang = []; |
| 1061 | 1061 | $tp_languages = DB::query( |
| 1062 | - 'SELECT name FROM ' . prefixTable('languages') |
|
| 1062 | + 'SELECT name FROM '.prefixTable('languages') |
|
| 1063 | 1063 | ); |
| 1064 | 1064 | foreach ($tp_languages as $tp_language) { |
| 1065 | 1065 | DB::query( |
| 1066 | - 'SELECT * FROM ' . prefixTable('users') . ' WHERE user_language = %s', |
|
| 1066 | + 'SELECT * FROM '.prefixTable('users').' WHERE user_language = %s', |
|
| 1067 | 1067 | $tp_language['name'] |
| 1068 | 1068 | ); |
| 1069 | 1069 | $usedLang[$tp_language['name']] = round((DB::count() * 100 / $counter_users), 0); |
@@ -1072,12 +1072,12 @@ discard block |
||
| 1072 | 1072 | // get list of ips |
| 1073 | 1073 | $usedIp = []; |
| 1074 | 1074 | $tp_ips = DB::query( |
| 1075 | - 'SELECT user_ip FROM ' . prefixTable('users') |
|
| 1075 | + 'SELECT user_ip FROM '.prefixTable('users') |
|
| 1076 | 1076 | ); |
| 1077 | 1077 | foreach ($tp_ips as $ip) { |
| 1078 | 1078 | if (array_key_exists($ip['user_ip'], $usedIp)) { |
| 1079 | 1079 | $usedIp[$ip['user_ip']] = $usedIp[$ip['user_ip']] + 1; |
| 1080 | - } elseif (! empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
| 1080 | + } elseif (!empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
| 1081 | 1081 | $usedIp[$ip['user_ip']] = 1; |
| 1082 | 1082 | } |
| 1083 | 1083 | } |
@@ -1134,25 +1134,25 @@ discard block |
||
| 1134 | 1134 | ): string { |
| 1135 | 1135 | // CAse where email not defined |
| 1136 | 1136 | if ($email === 'none' || empty($email) === true) { |
| 1137 | - return '"error":"" , "message":"' . langHdl('forgot_my_pw_email_sent') . '"'; |
|
| 1137 | + return '"error":"" , "message":"'.langHdl('forgot_my_pw_email_sent').'"'; |
|
| 1138 | 1138 | } |
| 1139 | 1139 | |
| 1140 | 1140 | // Load settings |
| 1141 | - include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 1141 | + include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 1142 | 1142 | // Load superglobal |
| 1143 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1143 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1144 | 1144 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 1145 | 1145 | // Get user language |
| 1146 | - include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $superGlobal->get('user_language', 'SESSION') . '.php'; |
|
| 1146 | + include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$superGlobal->get('user_language', 'SESSION').'.php'; |
|
| 1147 | 1147 | // Load library |
| 1148 | - include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 1148 | + include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 1149 | 1149 | // load PHPMailer |
| 1150 | 1150 | $mail = new SplClassLoader('PHPMailer\PHPMailer', '../includes/libraries'); |
| 1151 | 1151 | $mail->register(); |
| 1152 | 1152 | $mail = new PHPMailer\PHPMailer\PHPMailer(true); |
| 1153 | 1153 | try { |
| 1154 | 1154 | // send to user |
| 1155 | - $mail->setLanguage('en', $SETTINGS['cpassman_dir'] . '/includes/libraries/PHPMailer/PHPMailer/language/'); |
|
| 1155 | + $mail->setLanguage('en', $SETTINGS['cpassman_dir'].'/includes/libraries/PHPMailer/PHPMailer/language/'); |
|
| 1156 | 1156 | $mail->SMTPDebug = 0; |
| 1157 | 1157 | //value 1 can be used to debug - 4 for debuging connections |
| 1158 | 1158 | $mail->Port = $SETTINGS['email_port']; |
@@ -1243,7 +1243,7 @@ discard block |
||
| 1243 | 1243 | <table width="600" cellpadding="0" cellspacing="0" border="0" class="container" bgcolor="#ffffff" style="border-spacing: 0; border-bottom: 1px solid #e0e0e0; box-shadow: 0 0 3px #ddd; color: #434343; font-family: Helvetica, Verdana, sans-serif;"> |
| 1244 | 1244 | <tr><td class="container-padding" bgcolor="#ffffff" style="border-collapse: collapse; border-left: 1px solid #e0e0e0; background-color: #ffffff; padding-left: 30px; padding-right: 30px;"> |
| 1245 | 1245 | <br><div style="float:right;">' . |
| 1246 | - $textMail . |
|
| 1246 | + $textMail. |
|
| 1247 | 1247 | '<br><br></td></tr></table> |
| 1248 | 1248 | </td></tr></table> |
| 1249 | 1249 | <br></body></html>'; |
@@ -1254,7 +1254,7 @@ discard block |
||
| 1254 | 1254 | */ |
| 1255 | 1255 | function generateKey(): string |
| 1256 | 1256 | { |
| 1257 | - return substr(md5(rand() . rand()), 0, 15); |
|
| 1257 | + return substr(md5(rand().rand()), 0, 15); |
|
| 1258 | 1258 | } |
| 1259 | 1259 | |
| 1260 | 1260 | /** |
@@ -1321,7 +1321,7 @@ discard block |
||
| 1321 | 1321 | { |
| 1322 | 1322 | array_walk_recursive( |
| 1323 | 1323 | $array, |
| 1324 | - static function (&$item): void { |
|
| 1324 | + static function(&$item): void { |
|
| 1325 | 1325 | if (mb_detect_encoding($item, 'utf-8', true) === false) { |
| 1326 | 1326 | $item = utf8_encode($item); |
| 1327 | 1327 | } |
@@ -1339,7 +1339,7 @@ discard block |
||
| 1339 | 1339 | * |
| 1340 | 1340 | * @return resource|string|array |
| 1341 | 1341 | */ |
| 1342 | -function prepareExchangedData(array|string $data, string $type, ?string $key = null) |
|
| 1342 | +function prepareExchangedData(array | string $data, string $type, ?string $key = null) |
|
| 1343 | 1343 | { |
| 1344 | 1344 | if (file_exists('../includes/config/tp.config.php')) { |
| 1345 | 1345 | include '../includes/config/tp.config.php'; |
@@ -1356,7 +1356,7 @@ discard block |
||
| 1356 | 1356 | } |
| 1357 | 1357 | |
| 1358 | 1358 | // Load superglobal |
| 1359 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1359 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1360 | 1360 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 1361 | 1361 | // Get superglobals |
| 1362 | 1362 | if ($key !== null) { |
@@ -1367,9 +1367,9 @@ discard block |
||
| 1367 | 1367 | } |
| 1368 | 1368 | |
| 1369 | 1369 | //load ClassLoader |
| 1370 | - include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 1370 | + include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 1371 | 1371 | //Load AES |
| 1372 | - $aes = new SplClassLoader('Encryption\Crypt', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 1372 | + $aes = new SplClassLoader('Encryption\Crypt', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 1373 | 1373 | $aes->register(); |
| 1374 | 1374 | if ($type === 'encode' && is_array($data) === true) { |
| 1375 | 1375 | // Ensure UTF8 format |
@@ -1459,8 +1459,8 @@ discard block |
||
| 1459 | 1459 | */ |
| 1460 | 1460 | function prefixTable(string $table): string |
| 1461 | 1461 | { |
| 1462 | - $safeTable = htmlspecialchars(DB_PREFIX . $table); |
|
| 1463 | - if (! empty($safeTable)) { |
|
| 1462 | + $safeTable = htmlspecialchars(DB_PREFIX.$table); |
|
| 1463 | + if (!empty($safeTable)) { |
|
| 1464 | 1464 | // sanitize string |
| 1465 | 1465 | return $safeTable; |
| 1466 | 1466 | } |
@@ -1490,13 +1490,13 @@ discard block |
||
| 1490 | 1490 | bool $lowercase = false, |
| 1491 | 1491 | array $SETTINGS = [] |
| 1492 | 1492 | ): string { |
| 1493 | - include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 1494 | - $generator = new SplClassLoader('PasswordGenerator\Generator', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 1493 | + include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 1494 | + $generator = new SplClassLoader('PasswordGenerator\Generator', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 1495 | 1495 | $generator->register(); |
| 1496 | 1496 | $generator = new PasswordGenerator\Generator\ComputerPasswordGenerator(); |
| 1497 | 1497 | // Is PHP7 being used? |
| 1498 | 1498 | if (version_compare(PHP_VERSION, '7.0.0', '>=')) { |
| 1499 | - $php7generator = new SplClassLoader('PasswordGenerator\RandomGenerator', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 1499 | + $php7generator = new SplClassLoader('PasswordGenerator\RandomGenerator', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 1500 | 1500 | $php7generator->register(); |
| 1501 | 1501 | $generator->setRandomGenerator(new PasswordGenerator\RandomGenerator\Php7RandomGenerator()); |
| 1502 | 1502 | } |
@@ -1526,7 +1526,7 @@ discard block |
||
| 1526 | 1526 | function send_syslog($message, $host, $port, $component = 'teampass'): void |
| 1527 | 1527 | { |
| 1528 | 1528 | $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP); |
| 1529 | - $syslog_message = '<123>' . date('M d H:i:s ') . $component . ': ' . $message; |
|
| 1529 | + $syslog_message = '<123>'.date('M d H:i:s ').$component.': '.$message; |
|
| 1530 | 1530 | socket_sendto($sock, $syslog_message, strlen($syslog_message), 0, $host, $port); |
| 1531 | 1531 | socket_close($sock); |
| 1532 | 1532 | } |
@@ -1548,7 +1548,7 @@ discard block |
||
| 1548 | 1548 | } |
| 1549 | 1549 | |
| 1550 | 1550 | // include librairies & connect to DB |
| 1551 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 1551 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 1552 | 1552 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 1553 | 1553 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 1554 | 1554 | } |
@@ -1572,14 +1572,14 @@ discard block |
||
| 1572 | 1572 | if (isset($SETTINGS['syslog_enable']) === true && (int) $SETTINGS['syslog_enable'] === 1) { |
| 1573 | 1573 | if ($type === 'user_mngt') { |
| 1574 | 1574 | send_syslog( |
| 1575 | - 'action=' . str_replace('at_', '', $label) . ' attribute=user user=' . $who . ' userid="' . $login . '" change="' . $field_1 . '" ', |
|
| 1575 | + 'action='.str_replace('at_', '', $label).' attribute=user user='.$who.' userid="'.$login.'" change="'.$field_1.'" ', |
|
| 1576 | 1576 | $SETTINGS['syslog_host'], |
| 1577 | 1577 | $SETTINGS['syslog_port'], |
| 1578 | 1578 | 'teampass' |
| 1579 | 1579 | ); |
| 1580 | 1580 | } else { |
| 1581 | 1581 | send_syslog( |
| 1582 | - 'action=' . $type . ' attribute=' . $label . ' user=' . $who . ' userid="' . $login . '" ', |
|
| 1582 | + 'action='.$type.' attribute='.$label.' user='.$who.' userid="'.$login.'" ', |
|
| 1583 | 1583 | $SETTINGS['syslog_host'], |
| 1584 | 1584 | $SETTINGS['syslog_port'], |
| 1585 | 1585 | 'teampass' |
@@ -1611,7 +1611,7 @@ discard block |
||
| 1611 | 1611 | ?string $encryption_type = null |
| 1612 | 1612 | ): void { |
| 1613 | 1613 | // include librairies & connect to DB |
| 1614 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 1614 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 1615 | 1615 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 1616 | 1616 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 1617 | 1617 | } |
@@ -1655,7 +1655,7 @@ discard block |
||
| 1655 | 1655 | if (empty($item_label) === true) { |
| 1656 | 1656 | $dataItem = DB::queryfirstrow( |
| 1657 | 1657 | 'SELECT id, id_tree, label |
| 1658 | - FROM ' . prefixTable('items') . ' |
|
| 1658 | + FROM ' . prefixTable('items').' |
|
| 1659 | 1659 | WHERE id = %i', |
| 1660 | 1660 | $item_id |
| 1661 | 1661 | ); |
@@ -1663,11 +1663,11 @@ discard block |
||
| 1663 | 1663 | } |
| 1664 | 1664 | |
| 1665 | 1665 | send_syslog( |
| 1666 | - 'action=' . str_replace('at_', '', $action) . |
|
| 1667 | - ' attribute=' . str_replace('at_', '', $attribute[0]) . |
|
| 1668 | - ' itemno=' . $item_id . |
|
| 1669 | - ' user=' . is_null($login) === true ? '' : addslashes((string) $login) . |
|
| 1670 | - ' itemname="' . addslashes($item_label) . '"', |
|
| 1666 | + 'action='.str_replace('at_', '', $action). |
|
| 1667 | + ' attribute='.str_replace('at_', '', $attribute[0]). |
|
| 1668 | + ' itemno='.$item_id. |
|
| 1669 | + ' user='.is_null($login) === true ? '' : addslashes((string) $login). |
|
| 1670 | + ' itemname="'.addslashes($item_label).'"', |
|
| 1671 | 1671 | $SETTINGS['syslog_host'], |
| 1672 | 1672 | $SETTINGS['syslog_port'], |
| 1673 | 1673 | 'teampass' |
@@ -1693,7 +1693,7 @@ discard block |
||
| 1693 | 1693 | && $action === 'at_shown' |
| 1694 | 1694 | ) { |
| 1695 | 1695 | // Load superglobal |
| 1696 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1696 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1697 | 1697 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 1698 | 1698 | // Get superglobals |
| 1699 | 1699 | $globalsLastname = $superGlobal->get('lastname', 'SESSION'); |
@@ -1702,7 +1702,7 @@ discard block |
||
| 1702 | 1702 | // Get info about item |
| 1703 | 1703 | $dataItem = DB::queryfirstrow( |
| 1704 | 1704 | 'SELECT id, id_tree, label |
| 1705 | - FROM ' . prefixTable('items') . ' |
|
| 1705 | + FROM ' . prefixTable('items').' |
|
| 1706 | 1706 | WHERE id = %i', |
| 1707 | 1707 | $item_id |
| 1708 | 1708 | ); |
@@ -1716,9 +1716,9 @@ discard block |
||
| 1716 | 1716 | 'body' => str_replace( |
| 1717 | 1717 | ['#tp_user#', '#tp_item#', '#tp_link#'], |
| 1718 | 1718 | [ |
| 1719 | - addslashes($globalsName . ' ' . $globalsLastname), |
|
| 1719 | + addslashes($globalsName.' '.$globalsLastname), |
|
| 1720 | 1720 | addslashes($item_label), |
| 1721 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $item_id, |
|
| 1721 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$item_id, |
|
| 1722 | 1722 | ], |
| 1723 | 1723 | langHdl('email_on_open_notification_mail') |
| 1724 | 1724 | ), |
@@ -1740,7 +1740,7 @@ discard block |
||
| 1740 | 1740 | function notifyChangesToSubscribers(int $item_id, string $label, array $changes, array $SETTINGS): void |
| 1741 | 1741 | { |
| 1742 | 1742 | // Load superglobal |
| 1743 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1743 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1744 | 1744 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 1745 | 1745 | // Get superglobals |
| 1746 | 1746 | $globalsUserId = $superGlobal->get('user_id', 'SESSION'); |
@@ -1750,8 +1750,8 @@ discard block |
||
| 1750 | 1750 | $notification = DB::queryOneColumn( |
| 1751 | 1751 | 'email', |
| 1752 | 1752 | 'SELECT * |
| 1753 | - FROM ' . prefixTable('notification') . ' AS n |
|
| 1754 | - INNER JOIN ' . prefixTable('users') . ' AS u ON (n.user_id = u.id) |
|
| 1753 | + FROM ' . prefixTable('notification').' AS n |
|
| 1754 | + INNER JOIN ' . prefixTable('users').' AS u ON (n.user_id = u.id) |
|
| 1755 | 1755 | WHERE n.item_id = %i AND n.user_id != %i', |
| 1756 | 1756 | $item_id, |
| 1757 | 1757 | $globalsUserId |
@@ -1762,7 +1762,7 @@ discard block |
||
| 1762 | 1762 | // Get list of changes |
| 1763 | 1763 | $htmlChanges = '<ul>'; |
| 1764 | 1764 | foreach ($changes as $change) { |
| 1765 | - $htmlChanges .= '<li>' . $change . '</li>'; |
|
| 1765 | + $htmlChanges .= '<li>'.$change.'</li>'; |
|
| 1766 | 1766 | } |
| 1767 | 1767 | $htmlChanges .= '</ul>'; |
| 1768 | 1768 | // send email |
@@ -1793,7 +1793,7 @@ discard block |
||
| 1793 | 1793 | function geItemReadablePath(int $id_tree, string $label, array $SETTINGS): string |
| 1794 | 1794 | { |
| 1795 | 1795 | // Class loader |
| 1796 | - include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 1796 | + include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 1797 | 1797 | //Load Tree |
| 1798 | 1798 | $tree = new SplClassLoader('Tree\NestedTree', '../includes/libraries'); |
| 1799 | 1799 | $tree->register(); |
@@ -1802,15 +1802,15 @@ discard block |
||
| 1802 | 1802 | $path = ''; |
| 1803 | 1803 | foreach ($arbo as $elem) { |
| 1804 | 1804 | if (empty($path) === true) { |
| 1805 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 1805 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 1806 | 1806 | } else { |
| 1807 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 1807 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 1808 | 1808 | } |
| 1809 | 1809 | } |
| 1810 | 1810 | |
| 1811 | 1811 | // Build text to show user |
| 1812 | 1812 | if (empty($label) === false) { |
| 1813 | - return empty($path) === true ? addslashes($label) : addslashes($label) . ' (' . $path . ')'; |
|
| 1813 | + return empty($path) === true ? addslashes($label) : addslashes($label).' ('.$path.')'; |
|
| 1814 | 1814 | } |
| 1815 | 1815 | return empty($path) === true ? '' : $path; |
| 1816 | 1816 | |
@@ -1863,11 +1863,11 @@ discard block |
||
| 1863 | 1863 | * @param string $field Field to refresh |
| 1864 | 1864 | * @param string $value Value to set |
| 1865 | 1865 | */ |
| 1866 | -function handleConfigFile(string $action, array $SETTINGS, ?string $field = null, ?string $value = null): string|bool |
|
| 1866 | +function handleConfigFile(string $action, array $SETTINGS, ?string $field = null, ?string $value = null): string | bool |
|
| 1867 | 1867 | { |
| 1868 | - $tp_config_file = $SETTINGS['cpassman_dir'] . '/includes/config/tp.config.php'; |
|
| 1868 | + $tp_config_file = $SETTINGS['cpassman_dir'].'/includes/config/tp.config.php'; |
|
| 1869 | 1869 | // include librairies & connect to DB |
| 1870 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 1870 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 1871 | 1871 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 1872 | 1872 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 1873 | 1873 | } |
@@ -1880,8 +1880,8 @@ discard block |
||
| 1880 | 1880 | if (file_exists($tp_config_file) === false || $action === 'rebuild') { |
| 1881 | 1881 | // perform a copy |
| 1882 | 1882 | if (file_exists($tp_config_file)) { |
| 1883 | - if (! copy($tp_config_file, $tp_config_file . '.' . date('Y_m_d_His', time()))) { |
|
| 1884 | - return "ERROR: Could not copy file '" . $tp_config_file . "'"; |
|
| 1883 | + if (!copy($tp_config_file, $tp_config_file.'.'.date('Y_m_d_His', time()))) { |
|
| 1884 | + return "ERROR: Could not copy file '".$tp_config_file."'"; |
|
| 1885 | 1885 | } |
| 1886 | 1886 | } |
| 1887 | 1887 | |
@@ -1891,11 +1891,11 @@ discard block |
||
| 1891 | 1891 | $data[1] = "global \$SETTINGS;\n"; |
| 1892 | 1892 | $data[2] = "\$SETTINGS = array (\n"; |
| 1893 | 1893 | $rows = DB::query( |
| 1894 | - 'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s', |
|
| 1894 | + 'SELECT * FROM '.prefixTable('misc').' WHERE type=%s', |
|
| 1895 | 1895 | 'admin' |
| 1896 | 1896 | ); |
| 1897 | 1897 | foreach ($rows as $record) { |
| 1898 | - array_push($data, " '" . $record['intitule'] . "' => '" . $record['valeur'] . "',\n"); |
|
| 1898 | + array_push($data, " '".$record['intitule']."' => '".$record['valeur']."',\n"); |
|
| 1899 | 1899 | } |
| 1900 | 1900 | array_push($data, ");\n"); |
| 1901 | 1901 | $data = array_unique($data); |
@@ -1909,15 +1909,15 @@ discard block |
||
| 1909 | 1909 | break; |
| 1910 | 1910 | } |
| 1911 | 1911 | |
| 1912 | - if (stristr($line, "'" . $field . "' => '")) { |
|
| 1913 | - $data[$inc] = " '" . $field . "' => '" . filter_var($value, FILTER_SANITIZE_STRING) . "',\n"; |
|
| 1912 | + if (stristr($line, "'".$field."' => '")) { |
|
| 1913 | + $data[$inc] = " '".$field."' => '".filter_var($value, FILTER_SANITIZE_STRING)."',\n"; |
|
| 1914 | 1914 | $bFound = true; |
| 1915 | 1915 | break; |
| 1916 | 1916 | } |
| 1917 | 1917 | ++$inc; |
| 1918 | 1918 | } |
| 1919 | 1919 | if ($bFound === false) { |
| 1920 | - $data[$inc] = " '" . $field . "' => '" . filter_var($value, FILTER_SANITIZE_STRING) . "',\n);\n"; |
|
| 1920 | + $data[$inc] = " '".$field."' => '".filter_var($value, FILTER_SANITIZE_STRING)."',\n);\n"; |
|
| 1921 | 1921 | } |
| 1922 | 1922 | } |
| 1923 | 1923 | |
@@ -1943,7 +1943,7 @@ discard block |
||
| 1943 | 1943 | { |
| 1944 | 1944 | global $SETTINGS; |
| 1945 | 1945 | /* LOAD CPASSMAN SETTINGS */ |
| 1946 | - if (! isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
| 1946 | + if (!isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
| 1947 | 1947 | $SETTINGS['duplicate_folder'] = 0; |
| 1948 | 1948 | //by default, this is set to 0; |
| 1949 | 1949 | $SETTINGS['duplicate_item'] = 0; |
@@ -1952,7 +1952,7 @@ discard block |
||
| 1952 | 1952 | //by default, this value is set to 5; |
| 1953 | 1953 | $settings = []; |
| 1954 | 1954 | $rows = DB::query( |
| 1955 | - 'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s_type OR type=%s_type2', |
|
| 1955 | + 'SELECT * FROM '.prefixTable('misc').' WHERE type=%s_type OR type=%s_type2', |
|
| 1956 | 1956 | [ |
| 1957 | 1957 | 'type' => 'admin', |
| 1958 | 1958 | 'type2' => 'settings', |
@@ -1979,7 +1979,7 @@ discard block |
||
| 1979 | 1979 | $source_cf = []; |
| 1980 | 1980 | $rows = DB::QUERY( |
| 1981 | 1981 | 'SELECT id_category |
| 1982 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 1982 | + FROM ' . prefixTable('categories_folders').' |
|
| 1983 | 1983 | WHERE id_folder = %i', |
| 1984 | 1984 | $source_id |
| 1985 | 1985 | ); |
@@ -1990,7 +1990,7 @@ discard block |
||
| 1990 | 1990 | $target_cf = []; |
| 1991 | 1991 | $rows = DB::QUERY( |
| 1992 | 1992 | 'SELECT id_category |
| 1993 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 1993 | + FROM ' . prefixTable('categories_folders').' |
|
| 1994 | 1994 | WHERE id_folder = %i', |
| 1995 | 1995 | $target_id |
| 1996 | 1996 | ); |
@@ -2021,11 +2021,11 @@ discard block |
||
| 2021 | 2021 | string $target_file, |
| 2022 | 2022 | array $SETTINGS, |
| 2023 | 2023 | ?string $password = null |
| 2024 | -): string|bool { |
|
| 2024 | +): string | bool { |
|
| 2025 | 2025 | // Load AntiXSS |
| 2026 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php'; |
|
| 2027 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/ASCII.php'; |
|
| 2028 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/UTF8.php'; |
|
| 2026 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php'; |
|
| 2027 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/ASCII.php'; |
|
| 2028 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/UTF8.php'; |
|
| 2029 | 2029 | $antiXss = new voku\helper\AntiXSS(); |
| 2030 | 2030 | // Protect against bad inputs |
| 2031 | 2031 | if (is_array($source_file) === true || is_array($target_file) === true) { |
@@ -2037,7 +2037,7 @@ discard block |
||
| 2037 | 2037 | $target_file = $antiXss->xss_clean($target_file); |
| 2038 | 2038 | if (empty($password) === true || is_null($password) === true) { |
| 2039 | 2039 | // get KEY to define password |
| 2040 | - $ascii_key = file_get_contents(SECUREPATH . '/teampass-seckey.txt'); |
|
| 2040 | + $ascii_key = file_get_contents(SECUREPATH.'/teampass-seckey.txt'); |
|
| 2041 | 2041 | $password = \Defuse\Crypto\Key::loadFromAsciiSafeString($ascii_key); |
| 2042 | 2042 | } |
| 2043 | 2043 | |
@@ -2078,18 +2078,18 @@ discard block |
||
| 2078 | 2078 | string $target_file, |
| 2079 | 2079 | array $SETTINGS, |
| 2080 | 2080 | ?string $password = null |
| 2081 | -): string|bool { |
|
| 2081 | +): string | bool { |
|
| 2082 | 2082 | // load PhpEncryption library |
| 2083 | 2083 | $path_to_encryption = '/includes/libraries/Encryption/Encryption/'; |
| 2084 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Crypto.php'; |
|
| 2085 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Encoding.php'; |
|
| 2086 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'DerivedKeys.php'; |
|
| 2087 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Key.php'; |
|
| 2088 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'KeyOrPassword.php'; |
|
| 2089 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'File.php'; |
|
| 2090 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'RuntimeTests.php'; |
|
| 2091 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'KeyProtectedByPassword.php'; |
|
| 2092 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Core.php'; |
|
| 2084 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Crypto.php'; |
|
| 2085 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Encoding.php'; |
|
| 2086 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'DerivedKeys.php'; |
|
| 2087 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Key.php'; |
|
| 2088 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'KeyOrPassword.php'; |
|
| 2089 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'File.php'; |
|
| 2090 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'RuntimeTests.php'; |
|
| 2091 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'KeyProtectedByPassword.php'; |
|
| 2092 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Core.php'; |
|
| 2093 | 2093 | try { |
| 2094 | 2094 | \Defuse\Crypto\File::encryptFileWithPassword( |
| 2095 | 2095 | $source_file, |
@@ -2121,18 +2121,18 @@ discard block |
||
| 2121 | 2121 | string $target_file, |
| 2122 | 2122 | array $SETTINGS, |
| 2123 | 2123 | ?string $password = null |
| 2124 | -): string|bool { |
|
| 2124 | +): string | bool { |
|
| 2125 | 2125 | // load PhpEncryption library |
| 2126 | 2126 | $path_to_encryption = '/includes/libraries/Encryption/Encryption/'; |
| 2127 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Crypto.php'; |
|
| 2128 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Encoding.php'; |
|
| 2129 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'DerivedKeys.php'; |
|
| 2130 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Key.php'; |
|
| 2131 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'KeyOrPassword.php'; |
|
| 2132 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'File.php'; |
|
| 2133 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'RuntimeTests.php'; |
|
| 2134 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'KeyProtectedByPassword.php'; |
|
| 2135 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Core.php'; |
|
| 2127 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Crypto.php'; |
|
| 2128 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Encoding.php'; |
|
| 2129 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'DerivedKeys.php'; |
|
| 2130 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Key.php'; |
|
| 2131 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'KeyOrPassword.php'; |
|
| 2132 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'File.php'; |
|
| 2133 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'RuntimeTests.php'; |
|
| 2134 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'KeyProtectedByPassword.php'; |
|
| 2135 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Core.php'; |
|
| 2136 | 2136 | try { |
| 2137 | 2137 | \Defuse\Crypto\File::decryptFileWithPassword( |
| 2138 | 2138 | $source_file, |
@@ -2177,9 +2177,9 @@ discard block |
||
| 2177 | 2177 | function fileDelete(string $file, array $SETTINGS): void |
| 2178 | 2178 | { |
| 2179 | 2179 | // Load AntiXSS |
| 2180 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/ASCII.php'; |
|
| 2181 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/UTF8.php'; |
|
| 2182 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php'; |
|
| 2180 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/ASCII.php'; |
|
| 2181 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/UTF8.php'; |
|
| 2182 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php'; |
|
| 2183 | 2183 | $antiXss = new voku\helper\AntiXSS(); |
| 2184 | 2184 | $file = $antiXss->xss_clean($file); |
| 2185 | 2185 | if (is_file($file)) { |
@@ -2224,7 +2224,7 @@ discard block |
||
| 2224 | 2224 | function recursiveChmod(string $path, string $filePerm = 0644, string $dirPerm = 0755): bool |
| 2225 | 2225 | { |
| 2226 | 2226 | // Check if the path exists |
| 2227 | - if (! file_exists($path)) { |
|
| 2227 | + if (!file_exists($path)) { |
|
| 2228 | 2228 | return false; |
| 2229 | 2229 | } |
| 2230 | 2230 | |
@@ -2259,7 +2259,7 @@ discard block |
||
| 2259 | 2259 | */ |
| 2260 | 2260 | function accessToItemIsGranted(int $item_id, $SETTINGS) |
| 2261 | 2261 | { |
| 2262 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 2262 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 2263 | 2263 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 2264 | 2264 | // Prepare superGlobal variables |
| 2265 | 2265 | $session_groupes_visibles = $superGlobal->get('groupes_visibles', 'SESSION'); |
@@ -2267,7 +2267,7 @@ discard block |
||
| 2267 | 2267 | // Load item data |
| 2268 | 2268 | $data = DB::queryFirstRow( |
| 2269 | 2269 | 'SELECT id_tree |
| 2270 | - FROM ' . prefixTable('items') . ' |
|
| 2270 | + FROM ' . prefixTable('items').' |
|
| 2271 | 2271 | WHERE id = %i', |
| 2272 | 2272 | $item_id |
| 2273 | 2273 | ); |
@@ -2340,8 +2340,8 @@ discard block |
||
| 2340 | 2340 | function performDBQuery(array $SETTINGS, string $fields, string $table): array |
| 2341 | 2341 | { |
| 2342 | 2342 | // include librairies & connect to DB |
| 2343 | - include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 2344 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 2343 | + include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 2344 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 2345 | 2345 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 2346 | 2346 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 2347 | 2347 | } |
@@ -2353,7 +2353,7 @@ discard block |
||
| 2353 | 2353 | DB::$encoding = DB_ENCODING; |
| 2354 | 2354 | // Insert log in DB |
| 2355 | 2355 | return DB::query( |
| 2356 | - 'SELECT ' . $fields . ' |
|
| 2356 | + 'SELECT '.$fields.' |
|
| 2357 | 2357 | FROM ' . prefixTable($table) |
| 2358 | 2358 | ); |
| 2359 | 2359 | } |
@@ -2366,11 +2366,11 @@ discard block |
||
| 2366 | 2366 | function formatSizeUnits(int $bytes): string |
| 2367 | 2367 | { |
| 2368 | 2368 | if ($bytes >= 1073741824) { |
| 2369 | - $bytes = number_format($bytes / 1073741824, 2) . ' GB'; |
|
| 2369 | + $bytes = number_format($bytes / 1073741824, 2).' GB'; |
|
| 2370 | 2370 | } elseif ($bytes >= 1048576) { |
| 2371 | - $bytes = number_format($bytes / 1048576, 2) . ' MB'; |
|
| 2371 | + $bytes = number_format($bytes / 1048576, 2).' MB'; |
|
| 2372 | 2372 | } elseif ($bytes >= 1024) { |
| 2373 | - $bytes = number_format($bytes / 1024, 2) . ' KB'; |
|
| 2373 | + $bytes = number_format($bytes / 1024, 2).' KB'; |
|
| 2374 | 2374 | } elseif ($bytes > 1) { |
| 2375 | 2375 | $bytes .= ' bytes'; |
| 2376 | 2376 | } elseif ($bytes === 1) { |
@@ -2559,14 +2559,14 @@ discard block |
||
| 2559 | 2559 | |
| 2560 | 2560 | // Encrypt the file content |
| 2561 | 2561 | $plaintext = file_get_contents( |
| 2562 | - filter_var($fileInPath . '/' . $fileInName, FILTER_SANITIZE_URL) |
|
| 2562 | + filter_var($fileInPath.'/'.$fileInName, FILTER_SANITIZE_URL) |
|
| 2563 | 2563 | ); |
| 2564 | 2564 | $ciphertext = $cipher->encrypt($plaintext); |
| 2565 | 2565 | // Save new file |
| 2566 | 2566 | $hash = md5($plaintext); |
| 2567 | - $fileOut = $fileInPath . '/' . TP_FILE_PREFIX . $hash; |
|
| 2567 | + $fileOut = $fileInPath.'/'.TP_FILE_PREFIX.$hash; |
|
| 2568 | 2568 | file_put_contents($fileOut, $ciphertext); |
| 2569 | - unlink($fileInPath . '/' . $fileInName); |
|
| 2569 | + unlink($fileInPath.'/'.$fileInName); |
|
| 2570 | 2570 | return [ |
| 2571 | 2571 | 'fileHash' => base64_encode($hash), |
| 2572 | 2572 | 'objectKey' => base64_encode($objectKey), |
@@ -2582,7 +2582,7 @@ discard block |
||
| 2582 | 2582 | */ |
| 2583 | 2583 | function decryptFile(string $fileName, string $filePath, string $key): string |
| 2584 | 2584 | { |
| 2585 | - if (! defined('FILE_BUFFER_SIZE')) { |
|
| 2585 | + if (!defined('FILE_BUFFER_SIZE')) { |
|
| 2586 | 2586 | define('FILE_BUFFER_SIZE', 128 * 1024); |
| 2587 | 2587 | } |
| 2588 | 2588 | |
@@ -2601,7 +2601,7 @@ discard block |
||
| 2601 | 2601 | $cipher->enableContinuousBuffer(); |
| 2602 | 2602 | $cipher->disablePadding(); |
| 2603 | 2603 | // Get file content |
| 2604 | - $ciphertext = file_get_contents($filePath . '/' . TP_FILE_PREFIX . $fileName); |
|
| 2604 | + $ciphertext = file_get_contents($filePath.'/'.TP_FILE_PREFIX.$fileName); |
|
| 2605 | 2605 | // Decrypt file content and return |
| 2606 | 2606 | return base64_encode($cipher->decrypt($ciphertext)); |
| 2607 | 2607 | } |
@@ -2651,8 +2651,8 @@ discard block |
||
| 2651 | 2651 | array $SETTINGS |
| 2652 | 2652 | ): void { |
| 2653 | 2653 | // include librairies & connect to DB |
| 2654 | - include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 2655 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 2654 | + include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 2655 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 2656 | 2656 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 2657 | 2657 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 2658 | 2658 | } |
@@ -2669,7 +2669,7 @@ discard block |
||
| 2669 | 2669 | $post_object_id |
| 2670 | 2670 | ); |
| 2671 | 2671 | // Superglobals |
| 2672 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 2672 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 2673 | 2673 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 2674 | 2674 | // Prepare superGlobal variables |
| 2675 | 2675 | $sessionPpersonaFolders = $superGlobal->get('personal_folders', 'SESSION'); |
@@ -2694,8 +2694,8 @@ discard block |
||
| 2694 | 2694 | // Create sharekey for each user |
| 2695 | 2695 | $users = DB::query( |
| 2696 | 2696 | 'SELECT id, public_key |
| 2697 | - FROM ' . prefixTable('users') . ' |
|
| 2698 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '") |
|
| 2697 | + FROM ' . prefixTable('users').' |
|
| 2698 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'") |
|
| 2699 | 2699 | AND public_key != ""' |
| 2700 | 2700 | ); |
| 2701 | 2701 | foreach ($users as $user) { |
@@ -2723,7 +2723,7 @@ discard block |
||
| 2723 | 2723 | function isBase64(string $str): bool |
| 2724 | 2724 | { |
| 2725 | 2725 | $str = (string) trim($str); |
| 2726 | - if (! isset($str[0])) { |
|
| 2726 | + if (!isset($str[0])) { |
|
| 2727 | 2727 | return false; |
| 2728 | 2728 | } |
| 2729 | 2729 | |
@@ -2789,13 +2789,13 @@ discard block |
||
| 2789 | 2789 | ], |
| 2790 | 2790 | ]; |
| 2791 | 2791 | // Load expected libraries |
| 2792 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php'; |
|
| 2793 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php'; |
|
| 2794 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php'; |
|
| 2795 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php'; |
|
| 2796 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php'; |
|
| 2797 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapBase.php'; |
|
| 2798 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php'; |
|
| 2792 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php'; |
|
| 2793 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php'; |
|
| 2794 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php'; |
|
| 2795 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php'; |
|
| 2796 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php'; |
|
| 2797 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapBase.php'; |
|
| 2798 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php'; |
|
| 2799 | 2799 | $ad = new SplClassLoader('LdapRecord', '../includes/libraries'); |
| 2800 | 2800 | $ad->register(); |
| 2801 | 2801 | $connection = new Connection($config); |
@@ -2804,7 +2804,7 @@ discard block |
||
| 2804 | 2804 | $connection->connect(); |
| 2805 | 2805 | } catch (\LdapRecord\Auth\BindException $e) { |
| 2806 | 2806 | $error = $e->getDetailedError(); |
| 2807 | - echo 'Error : '.$error->getErrorCode().' - '.$error->getErrorMessage(). '<br>'.$error->getDiagnosticMessage(); |
|
| 2807 | + echo 'Error : '.$error->getErrorCode().' - '.$error->getErrorMessage().'<br>'.$error->getDiagnosticMessage(); |
|
| 2808 | 2808 | return false; |
| 2809 | 2809 | } |
| 2810 | 2810 | |
@@ -2813,7 +2813,7 @@ discard block |
||
| 2813 | 2813 | $connection->auth()->attempt($SETTINGS['ldap_user_attribute'].'='.$login.','.$SETTINGS['ldap_bdn'], $password, $stayAuthenticated = true); |
| 2814 | 2814 | } catch (\LdapRecord\Auth\BindException $e) { |
| 2815 | 2815 | $error = $e->getDetailedError(); |
| 2816 | - echo 'Error : '.$error->getErrorCode().' - '.$error->getErrorMessage(). '<br>'.$error->getDiagnosticMessage(); |
|
| 2816 | + echo 'Error : '.$error->getErrorCode().' - '.$error->getErrorMessage().'<br>'.$error->getDiagnosticMessage(); |
|
| 2817 | 2817 | return false; |
| 2818 | 2818 | } |
| 2819 | 2819 | |
@@ -2826,11 +2826,11 @@ discard block |
||
| 2826 | 2826 | * @param int $userId User's id |
| 2827 | 2827 | * @param array $SETTINGS Teampass settings |
| 2828 | 2828 | */ |
| 2829 | -function deleteUserObjetsKeys(int $userId, array $SETTINGS): null|bool |
|
| 2829 | +function deleteUserObjetsKeys(int $userId, array $SETTINGS): null | bool |
|
| 2830 | 2830 | { |
| 2831 | 2831 | // include librairies & connect to DB |
| 2832 | - include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 2833 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 2832 | + include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 2833 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 2834 | 2834 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 2835 | 2835 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 2836 | 2836 | } |
@@ -2884,7 +2884,7 @@ discard block |
||
| 2884 | 2884 | foreach (DateTimeZone::listIdentifiers() as $timezone) { |
| 2885 | 2885 | $now->setTimezone(new DateTimeZone($timezone)); |
| 2886 | 2886 | $offsets[] = $offset = $now->getOffset(); |
| 2887 | - $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone); |
|
| 2887 | + $timezones[$timezone] = '('.format_GMT_offset($offset).') '.format_timezone_name($timezone); |
|
| 2888 | 2888 | } |
| 2889 | 2889 | |
| 2890 | 2890 | array_multisort($offsets, $timezones); |
@@ -2897,7 +2897,7 @@ discard block |
||
| 2897 | 2897 | { |
| 2898 | 2898 | $hours = intval($offset / 3600); |
| 2899 | 2899 | $minutes = abs(intval($offset % 3600 / 60)); |
| 2900 | - return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
| 2900 | + return 'GMT'.($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
| 2901 | 2901 | } |
| 2902 | 2902 | |
| 2903 | 2903 | function format_timezone_name($name) |