nilsteampassnet /
TeamPass
@@ -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'; |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | // Connect to mysql server |
| 79 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 79 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 80 | 80 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 81 | 81 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 82 | 82 | } |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | DB::$connect_options = DB_CONNECT_OPTIONS; |
| 91 | 91 | |
| 92 | 92 | // Load Tree |
| 93 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tree/NestedTree/NestedTree.php'; |
|
| 93 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tree/NestedTree/NestedTree.php'; |
|
| 94 | 94 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 95 | 95 | |
| 96 | 96 | |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | // About special settings |
| 328 | 328 | $dataFolderSettings = DB::queryFirstRow( |
| 329 | 329 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 330 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 330 | + FROM ' . prefixTable('nested_tree').' |
|
| 331 | 331 | WHERE id = %i', |
| 332 | 332 | $inputData['folderId'] |
| 333 | 333 | ); |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | // Get folder complexity |
| 345 | 345 | $folderComplexity = DB::queryfirstrow( |
| 346 | 346 | 'SELECT valeur |
| 347 | - FROM ' . prefixTable('misc') . ' |
|
| 347 | + FROM ' . prefixTable('misc').' |
|
| 348 | 348 | WHERE type = %s AND intitule = %i', |
| 349 | 349 | 'complex', |
| 350 | 350 | $inputData['folderId'] |
@@ -370,7 +370,7 @@ discard block |
||
| 370 | 370 | $itemExists = 0; |
| 371 | 371 | $newID = ''; |
| 372 | 372 | $data = DB::queryfirstrow( |
| 373 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 373 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 374 | 374 | WHERE label = %s AND inactif = %i', |
| 375 | 375 | $inputData['label'], |
| 376 | 376 | 0 |
@@ -497,7 +497,7 @@ discard block |
||
| 497 | 497 | // should we encrypt the data |
| 498 | 498 | $dataTmp = DB::queryFirstRow( |
| 499 | 499 | 'SELECT encrypted_data |
| 500 | - FROM ' . prefixTable('categories') . ' |
|
| 500 | + FROM ' . prefixTable('categories').' |
|
| 501 | 501 | WHERE id = %i', |
| 502 | 502 | $field_data[0] |
| 503 | 503 | ); |
@@ -553,7 +553,7 @@ discard block |
||
| 553 | 553 | ) { |
| 554 | 554 | DB::queryFirstRow( |
| 555 | 555 | 'SELECT * |
| 556 | - FROM ' . prefixTable('templates') . ' |
|
| 556 | + FROM ' . prefixTable('templates').' |
|
| 557 | 557 | WHERE item_id = %i', |
| 558 | 558 | $newID |
| 559 | 559 | ); |
@@ -622,11 +622,11 @@ discard block |
||
| 622 | 622 | ) { |
| 623 | 623 | foreach ($post_restricted_to as $userRest) { |
| 624 | 624 | if (empty($userRest) === false) { |
| 625 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest); |
|
| 625 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest); |
|
| 626 | 626 | if (empty($listOfRestricted)) { |
| 627 | 627 | $listOfRestricted = $dataTmp['login']; |
| 628 | 628 | } else { |
| 629 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 629 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 630 | 630 | } |
| 631 | 631 | } |
| 632 | 632 | } |
@@ -640,11 +640,11 @@ discard block |
||
| 640 | 640 | if (empty($data['restricted_to']) === false) { |
| 641 | 641 | foreach (explode(';', $data['restricted_to']) as $userRest) { |
| 642 | 642 | if (empty($userRest) === false) { |
| 643 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
| 643 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
| 644 | 644 | if (empty($oldRestrictionList) === true) { |
| 645 | 645 | $oldRestrictionList = $dataTmp['login']; |
| 646 | 646 | } else { |
| 647 | - $oldRestrictionList .= ';' . $dataTmp['login']; |
|
| 647 | + $oldRestrictionList .= ';'.$dataTmp['login']; |
|
| 648 | 648 | } |
| 649 | 649 | } |
| 650 | 650 | } |
@@ -707,7 +707,7 @@ discard block |
||
| 707 | 707 | if (empty($post_uploaded_file_id) === false) { |
| 708 | 708 | $rows = DB::query( |
| 709 | 709 | 'SELECT id |
| 710 | - FROM ' . prefixTable('files') . ' |
|
| 710 | + FROM ' . prefixTable('files').' |
|
| 711 | 711 | WHERE id_item = %s', |
| 712 | 712 | $post_uploaded_file_id |
| 713 | 713 | ); |
@@ -747,14 +747,14 @@ discard block |
||
| 747 | 747 | langHdl('email_subject'), |
| 748 | 748 | str_replace( |
| 749 | 749 | array('#label', '#link'), |
| 750 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $inputData['folderId'] . '&id=' . $newID . $txt['email_body3']), |
|
| 750 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$inputData['folderId'].'&id='.$newID.$txt['email_body3']), |
|
| 751 | 751 | langHdl('new_item_email_body') |
| 752 | 752 | ), |
| 753 | 753 | $emailAddress, |
| 754 | 754 | $SETTINGS, |
| 755 | 755 | str_replace( |
| 756 | 756 | array('#label', '#link'), |
| 757 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $inputData['folderId'] . '&id=' . $newID . $txt['email_body3']), |
|
| 757 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$inputData['folderId'].'&id='.$newID.$txt['email_body3']), |
|
| 758 | 758 | langHdl('new_item_email_body') |
| 759 | 759 | ) |
| 760 | 760 | ); |
@@ -804,7 +804,7 @@ discard block |
||
| 804 | 804 | |
| 805 | 805 | // Encrypt data to return |
| 806 | 806 | echo (string) prepareExchangedData( |
| 807 | - $SETTINGS['cpassman_dir'],$arrData, |
|
| 807 | + $SETTINGS['cpassman_dir'], $arrData, |
|
| 808 | 808 | 'encode' |
| 809 | 809 | ); |
| 810 | 810 | break; |
@@ -928,7 +928,7 @@ discard block |
||
| 928 | 928 | // About special settings |
| 929 | 929 | $dataFolderSettings = DB::queryFirstRow( |
| 930 | 930 | 'SELECT bloquer_creation, bloquer_modification, personal_folder, title |
| 931 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 931 | + FROM ' . prefixTable('nested_tree').' |
|
| 932 | 932 | WHERE id = %i', |
| 933 | 933 | $inputData['folderId'] |
| 934 | 934 | ); |
@@ -944,7 +944,7 @@ discard block |
||
| 944 | 944 | // Get folder complexity |
| 945 | 945 | $folderComplexity = DB::queryfirstrow( |
| 946 | 946 | 'SELECT valeur |
| 947 | - FROM ' . prefixTable('misc') . ' |
|
| 947 | + FROM ' . prefixTable('misc').' |
|
| 948 | 948 | WHERE type = %s AND intitule = %i', |
| 949 | 949 | 'complex', |
| 950 | 950 | $inputData['folderId'] |
@@ -984,8 +984,8 @@ discard block |
||
| 984 | 984 | // Get all informations for this item |
| 985 | 985 | $dataItem = DB::queryfirstrow( |
| 986 | 986 | 'SELECT * |
| 987 | - FROM ' . prefixTable('items') . ' as i |
|
| 988 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 987 | + FROM ' . prefixTable('items').' as i |
|
| 988 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 989 | 989 | WHERE i.id=%i AND l.action = %s', |
| 990 | 990 | $inputData['itemId'], |
| 991 | 991 | 'at_creation' |
@@ -995,7 +995,7 @@ discard block |
||
| 995 | 995 | //db::debugmode(true); |
| 996 | 996 | DB::query( |
| 997 | 997 | 'SELECT * |
| 998 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 998 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 999 | 999 | WHERE object_id = %i AND user_id = %s', |
| 1000 | 1000 | $inputData['itemId'], |
| 1001 | 1001 | $_SESSION['user_id'] |
@@ -1044,9 +1044,9 @@ discard block |
||
| 1044 | 1044 | '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, |
| 1045 | 1045 | 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, |
| 1046 | 1046 | u.login as user_login, u.email as user_email |
| 1047 | - FROM ' . prefixTable('items') . ' as i |
|
| 1048 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item) |
|
| 1049 | - INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user) |
|
| 1047 | + FROM ' . prefixTable('items').' as i |
|
| 1048 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item) |
|
| 1049 | + INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user) |
|
| 1050 | 1050 | WHERE i.id=%i', |
| 1051 | 1051 | $inputData['itemId'] |
| 1052 | 1052 | ); |
@@ -1054,7 +1054,7 @@ discard block |
||
| 1054 | 1054 | // Should we log a password change? |
| 1055 | 1055 | $userKey = DB::queryFirstRow( |
| 1056 | 1056 | 'SELECT share_key |
| 1057 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1057 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1058 | 1058 | WHERE user_id = %i AND object_id = %i', |
| 1059 | 1059 | $_SESSION['user_id'], |
| 1060 | 1060 | $inputData['itemId'] |
@@ -1113,7 +1113,7 @@ discard block |
||
| 1113 | 1113 | // Get list of tags |
| 1114 | 1114 | $itemTags = DB::queryFirstColumn( |
| 1115 | 1115 | 'SELECT tag |
| 1116 | - FROM ' . prefixTable('tags') . ' |
|
| 1116 | + FROM ' . prefixTable('tags').' |
|
| 1117 | 1117 | WHERE item_id = %i', |
| 1118 | 1118 | $inputData['itemId'] |
| 1119 | 1119 | ); |
@@ -1156,7 +1156,7 @@ discard block |
||
| 1156 | 1156 | $_SESSION['user_id'], |
| 1157 | 1157 | 'at_modification', |
| 1158 | 1158 | $_SESSION['login'], |
| 1159 | - 'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags |
|
| 1159 | + 'at_tag : '.implode(' ', $itemTags).' => '.$post_tags |
|
| 1160 | 1160 | ); |
| 1161 | 1161 | } |
| 1162 | 1162 | |
@@ -1194,8 +1194,8 @@ discard block |
||
| 1194 | 1194 | 'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv, |
| 1195 | 1195 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, |
| 1196 | 1196 | c.masked AS masked, i.id AS field_item_id |
| 1197 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 1198 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 1197 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 1198 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 1199 | 1199 | WHERE i.field_id = %i AND i.item_id = %i', |
| 1200 | 1200 | $field['id'], |
| 1201 | 1201 | $inputData['itemId'] |
@@ -1209,7 +1209,7 @@ discard block |
||
| 1209 | 1209 | // Perform new query |
| 1210 | 1210 | $dataTmpCat = DB::queryFirstRow( |
| 1211 | 1211 | 'SELECT id, title, encrypted_data, masked |
| 1212 | - FROM ' . prefixTable('categories') . ' |
|
| 1212 | + FROM ' . prefixTable('categories').' |
|
| 1213 | 1213 | WHERE id = %i', |
| 1214 | 1214 | $field['id'] |
| 1215 | 1215 | ); |
@@ -1281,7 +1281,7 @@ discard block |
||
| 1281 | 1281 | $_SESSION['user_id'], |
| 1282 | 1282 | 'at_modification', |
| 1283 | 1283 | $_SESSION['login'], |
| 1284 | - 'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value'] |
|
| 1284 | + 'at_field : '.$dataTmpCat['title'].' : '.$field['value'] |
|
| 1285 | 1285 | ); |
| 1286 | 1286 | } else { |
| 1287 | 1287 | // compare the old and new value |
@@ -1289,7 +1289,7 @@ discard block |
||
| 1289 | 1289 | // Get user sharekey for this field |
| 1290 | 1290 | $userKey = DB::queryFirstRow( |
| 1291 | 1291 | 'SELECT share_key |
| 1292 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 1292 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 1293 | 1293 | WHERE user_id = %i AND object_id = %i', |
| 1294 | 1294 | $_SESSION['user_id'], |
| 1295 | 1295 | $dataTmpCat['field_item_id'] |
@@ -1359,7 +1359,7 @@ discard block |
||
| 1359 | 1359 | $_SESSION['user_id'], |
| 1360 | 1360 | 'at_modification', |
| 1361 | 1361 | $_SESSION['login'], |
| 1362 | - 'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal |
|
| 1362 | + 'at_field : '.$dataTmpCat['title'].' => '.$oldVal |
|
| 1363 | 1363 | ); |
| 1364 | 1364 | } |
| 1365 | 1365 | } |
@@ -1384,7 +1384,7 @@ discard block |
||
| 1384 | 1384 | ) { |
| 1385 | 1385 | DB::queryFirstRow( |
| 1386 | 1386 | 'SELECT * |
| 1387 | - FROM ' . prefixTable('templates') . ' |
|
| 1387 | + FROM ' . prefixTable('templates').' |
|
| 1388 | 1388 | WHERE item_id = %i', |
| 1389 | 1389 | $inputData['itemId'] |
| 1390 | 1390 | ); |
@@ -1427,7 +1427,7 @@ discard block |
||
| 1427 | 1427 | // check if elem exists in Table. If not add it or update it. |
| 1428 | 1428 | DB::query( |
| 1429 | 1429 | 'SELECT * |
| 1430 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 1430 | + FROM ' . prefixTable('automatic_del').' |
|
| 1431 | 1431 | WHERE item_id = %i', |
| 1432 | 1432 | $inputData['itemId'] |
| 1433 | 1433 | ); |
@@ -1454,7 +1454,7 @@ discard block |
||
| 1454 | 1454 | // Store updates performed |
| 1455 | 1455 | array_push( |
| 1456 | 1456 | $arrayOfChanges, |
| 1457 | - langHdl('automatic_deletion_engaged') . ': ' . langHdl('enabled') |
|
| 1457 | + langHdl('automatic_deletion_engaged').': '.langHdl('enabled') |
|
| 1458 | 1458 | ); |
| 1459 | 1459 | |
| 1460 | 1460 | // update LOG |
@@ -1497,7 +1497,7 @@ discard block |
||
| 1497 | 1497 | // Store updates performed |
| 1498 | 1498 | array_push( |
| 1499 | 1499 | $arrayOfChanges, |
| 1500 | - langHdl('automatic_deletion_engaged') . ': ' . langHdl('disabled') |
|
| 1500 | + langHdl('automatic_deletion_engaged').': '.langHdl('disabled') |
|
| 1501 | 1501 | ); |
| 1502 | 1502 | |
| 1503 | 1503 | // update LOG |
@@ -1530,7 +1530,7 @@ discard block |
||
| 1530 | 1530 | if (empty($userId) === false) { |
| 1531 | 1531 | $dataTmp = DB::queryfirstrow( |
| 1532 | 1532 | 'SELECT id, name, lastname |
| 1533 | - FROM ' . prefixTable('users') . ' |
|
| 1533 | + FROM ' . prefixTable('users').' |
|
| 1534 | 1534 | WHERE id= %i', |
| 1535 | 1535 | $userId |
| 1536 | 1536 | ); |
@@ -1538,7 +1538,7 @@ discard block |
||
| 1538 | 1538 | // Add to array |
| 1539 | 1539 | array_push( |
| 1540 | 1540 | $arrayOfUsersRestriction, |
| 1541 | - $dataTmp['name'] . ' ' . $dataTmp['lastname'] |
|
| 1541 | + $dataTmp['name'].' '.$dataTmp['lastname'] |
|
| 1542 | 1542 | ); |
| 1543 | 1543 | array_push( |
| 1544 | 1544 | $arrayOfUsersIdRestriction, |
@@ -1569,8 +1569,8 @@ discard block |
||
| 1569 | 1569 | // get values before deleting them |
| 1570 | 1570 | $rows = DB::query( |
| 1571 | 1571 | 'SELECT t.title, t.id AS id |
| 1572 | - FROM ' . prefixTable('roles_title') . ' as t |
|
| 1573 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id) |
|
| 1572 | + FROM ' . prefixTable('roles_title').' as t |
|
| 1573 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id) |
|
| 1574 | 1574 | WHERE r.item_id = %i |
| 1575 | 1575 | ORDER BY t.title ASC', |
| 1576 | 1576 | $inputData['itemId'] |
@@ -1604,7 +1604,7 @@ discard block |
||
| 1604 | 1604 | ); |
| 1605 | 1605 | $dataTmp = DB::queryfirstrow( |
| 1606 | 1606 | 'SELECT title |
| 1607 | - FROM ' . prefixTable('roles_title') . ' |
|
| 1607 | + FROM ' . prefixTable('roles_title').' |
|
| 1608 | 1608 | WHERE id = %i', |
| 1609 | 1609 | $role |
| 1610 | 1610 | ); |
@@ -1645,8 +1645,8 @@ discard block |
||
| 1645 | 1645 | $_SESSION['user_id'], |
| 1646 | 1646 | 'at_modification', |
| 1647 | 1647 | $_SESSION['login'], |
| 1648 | - 'at_restriction : ' . (count($diffUsersRestiction) > 0 ? |
|
| 1649 | - implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1648 | + 'at_restriction : '.(count($diffUsersRestiction) > 0 ? |
|
| 1649 | + implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1650 | 1650 | ); |
| 1651 | 1651 | } |
| 1652 | 1652 | |
@@ -1666,7 +1666,7 @@ discard block |
||
| 1666 | 1666 | $_SESSION['user_id'], |
| 1667 | 1667 | 'at_modification', |
| 1668 | 1668 | $_SESSION['login'], |
| 1669 | - 'at_label : ' . $data['label'] . ' => ' . $inputData['label'] |
|
| 1669 | + 'at_label : '.$data['label'].' => '.$inputData['label'] |
|
| 1670 | 1670 | ); |
| 1671 | 1671 | } |
| 1672 | 1672 | // LOGIN |
@@ -1685,7 +1685,7 @@ discard block |
||
| 1685 | 1685 | $_SESSION['user_id'], |
| 1686 | 1686 | 'at_modification', |
| 1687 | 1687 | $_SESSION['login'], |
| 1688 | - 'at_login : ' . $data['login'] . ' => ' . $post_login |
|
| 1688 | + 'at_login : '.$data['login'].' => '.$post_login |
|
| 1689 | 1689 | ); |
| 1690 | 1690 | } |
| 1691 | 1691 | |
@@ -1704,7 +1704,7 @@ discard block |
||
| 1704 | 1704 | $_SESSION['user_id'], |
| 1705 | 1705 | 'at_modification', |
| 1706 | 1706 | $_SESSION['login'], |
| 1707 | - 'at_email : ' . $data['email'] . ' => ' . $post_email |
|
| 1707 | + 'at_email : '.$data['email'].' => '.$post_email |
|
| 1708 | 1708 | ); |
| 1709 | 1709 | } |
| 1710 | 1710 | // URL |
@@ -1723,7 +1723,7 @@ discard block |
||
| 1723 | 1723 | $_SESSION['user_id'], |
| 1724 | 1724 | 'at_modification', |
| 1725 | 1725 | $_SESSION['login'], |
| 1726 | - 'at_url : ' . $data['url'] . ' => ' . $post_url |
|
| 1726 | + 'at_url : '.$data['url'].' => '.$post_url |
|
| 1727 | 1727 | ); |
| 1728 | 1728 | } |
| 1729 | 1729 | // DESCRIPTION |
@@ -1748,7 +1748,7 @@ discard block |
||
| 1748 | 1748 | // FOLDER |
| 1749 | 1749 | if ((int) $data['id_tree'] !== (int) $inputData['folderId']) { |
| 1750 | 1750 | // Get name of folders |
| 1751 | - $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 1751 | + $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 1752 | 1752 | |
| 1753 | 1753 | // Store updates performed |
| 1754 | 1754 | array_push( |
@@ -1764,7 +1764,7 @@ discard block |
||
| 1764 | 1764 | $_SESSION['user_id'], |
| 1765 | 1765 | 'at_modification', |
| 1766 | 1766 | $_SESSION['login'], |
| 1767 | - 'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title'] |
|
| 1767 | + 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title'] |
|
| 1768 | 1768 | ); |
| 1769 | 1769 | } |
| 1770 | 1770 | // ANYONE_CAN_MODIFY |
@@ -1772,7 +1772,7 @@ discard block |
||
| 1772 | 1772 | // Store updates performed |
| 1773 | 1773 | array_push( |
| 1774 | 1774 | $arrayOfChanges, |
| 1775 | - langHdl('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? langHdl('disabled') : langHdl('enabled')) |
|
| 1775 | + langHdl('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? langHdl('disabled') : langHdl('enabled')) |
|
| 1776 | 1776 | ); |
| 1777 | 1777 | |
| 1778 | 1778 | // Log |
@@ -1783,15 +1783,15 @@ discard block |
||
| 1783 | 1783 | $_SESSION['user_id'], |
| 1784 | 1784 | 'at_modification', |
| 1785 | 1785 | $_SESSION['login'], |
| 1786 | - 'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 1786 | + 'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 1787 | 1787 | ); |
| 1788 | 1788 | } |
| 1789 | 1789 | |
| 1790 | 1790 | // Reload new values |
| 1791 | 1791 | $dataItem = DB::queryfirstrow( |
| 1792 | 1792 | 'SELECT * |
| 1793 | - FROM ' . prefixTable('items') . ' as i |
|
| 1794 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 1793 | + FROM ' . prefixTable('items').' as i |
|
| 1794 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 1795 | 1795 | WHERE i.id = %i AND l.action = %s', |
| 1796 | 1796 | $inputData['itemId'], |
| 1797 | 1797 | 'at_creation' |
@@ -1800,8 +1800,8 @@ discard block |
||
| 1800 | 1800 | $history = ''; |
| 1801 | 1801 | $rows = DB::query( |
| 1802 | 1802 | 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login |
| 1803 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 1804 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 1803 | + FROM ' . prefixTable('log_items').' as l |
|
| 1804 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 1805 | 1805 | WHERE l.action <> %s AND id_item=%s', |
| 1806 | 1806 | 'at_shown', |
| 1807 | 1807 | $inputData['itemId'] |
@@ -1810,14 +1810,14 @@ discard block |
||
| 1810 | 1810 | if ($record['raison'] === NULL) continue; |
| 1811 | 1811 | $reason = explode(':', $record['raison']); |
| 1812 | 1812 | if (count($reason) > 0) { |
| 1813 | - $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
|
| 1814 | - . $record['login'] . ' - ' . langHdl($record['action']) . ' - ' |
|
| 1815 | - . (empty($record['raison']) === false ? (count($reason) > 1 ? langHdl(trim($reason[0])) . ' : ' . $reason[1] |
|
| 1813 | + $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - ' |
|
| 1814 | + . $record['login'].' - '.langHdl($record['action']).' - ' |
|
| 1815 | + . (empty($record['raison']) === false ? (count($reason) > 1 ? langHdl(trim($reason[0])).' : '.$reason[1] |
|
| 1816 | 1816 | : langHdl(trim($reason[0]))) : ''); |
| 1817 | 1817 | if (empty($history)) { |
| 1818 | 1818 | $history = $sentence; |
| 1819 | 1819 | } else { |
| 1820 | - $history .= '<br />' . $sentence; |
|
| 1820 | + $history .= '<br />'.$sentence; |
|
| 1821 | 1821 | } |
| 1822 | 1822 | } |
| 1823 | 1823 | } |
@@ -1948,7 +1948,7 @@ discard block |
||
| 1948 | 1948 | ) { |
| 1949 | 1949 | // load the original record into an array |
| 1950 | 1950 | $originalRecord = DB::queryfirstrow( |
| 1951 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 1951 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 1952 | 1952 | WHERE id = %i', |
| 1953 | 1953 | $inputData['itemId'] |
| 1954 | 1954 | ); |
@@ -1968,7 +1968,7 @@ discard block |
||
| 1968 | 1968 | |
| 1969 | 1969 | // Load the destination folder record into an array |
| 1970 | 1970 | $dataDestination = DB::queryfirstrow( |
| 1971 | - 'SELECT personal_folder FROM ' . prefixTable('nested_tree') . ' |
|
| 1971 | + 'SELECT personal_folder FROM '.prefixTable('nested_tree').' |
|
| 1972 | 1972 | WHERE id = %i', |
| 1973 | 1973 | $post_dest_id |
| 1974 | 1974 | ); |
@@ -1976,7 +1976,7 @@ discard block |
||
| 1976 | 1976 | // Get the ITEM object key for the user |
| 1977 | 1977 | $userKey = DB::queryFirstRow( |
| 1978 | 1978 | 'SELECT share_key |
| 1979 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1979 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1980 | 1980 | WHERE user_id = %i AND object_id = %i', |
| 1981 | 1981 | $_SESSION['user_id'], |
| 1982 | 1982 | $inputData['itemId'] |
@@ -2049,7 +2049,7 @@ discard block |
||
| 2049 | 2049 | // Manage Custom Fields |
| 2050 | 2050 | $rows = DB::query( |
| 2051 | 2051 | 'SELECT * |
| 2052 | - FROM ' . prefixTable('categories_items') . ' |
|
| 2052 | + FROM ' . prefixTable('categories_items').' |
|
| 2053 | 2053 | WHERE item_id = %i', |
| 2054 | 2054 | $inputData['itemId'] |
| 2055 | 2055 | ); |
@@ -2097,15 +2097,15 @@ discard block |
||
| 2097 | 2097 | $rows = DB::query( |
| 2098 | 2098 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
| 2099 | 2099 | f.size AS size, f.type AS type, s.share_key AS share_key |
| 2100 | - FROM ' . prefixTable('files') . ' AS f |
|
| 2101 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 2100 | + FROM ' . prefixTable('files').' AS f |
|
| 2101 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 2102 | 2102 | WHERE s.user_id = %i AND f.id_item = %i', |
| 2103 | 2103 | $_SESSION['user_id'], |
| 2104 | 2104 | $inputData['itemId'] |
| 2105 | 2105 | ); |
| 2106 | 2106 | foreach ($rows as $record) { |
| 2107 | 2107 | // Check if file still exists |
| 2108 | - if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) { |
|
| 2108 | + if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) { |
|
| 2109 | 2109 | // Step1 - decrypt the file |
| 2110 | 2110 | $fileContent = decryptFile( |
| 2111 | 2111 | $record['file'], |
@@ -2114,8 +2114,8 @@ discard block |
||
| 2114 | 2114 | ); |
| 2115 | 2115 | |
| 2116 | 2116 | // Step2 - create file |
| 2117 | - $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension']; |
|
| 2118 | - $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab'); |
|
| 2117 | + $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension']; |
|
| 2118 | + $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab'); |
|
| 2119 | 2119 | if ($outstream === false) { |
| 2120 | 2120 | echo prepareExchangedData( |
| 2121 | 2121 | $SETTINGS['cpassman_dir'], |
@@ -2166,7 +2166,7 @@ discard block |
||
| 2166 | 2166 | |
| 2167 | 2167 | // ------------------------- |
| 2168 | 2168 | // Add specific restrictions |
| 2169 | - $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2169 | + $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2170 | 2170 | foreach ($rows as $record) { |
| 2171 | 2171 | DB::insert( |
| 2172 | 2172 | prefixTable('restriction_to_roles'), |
@@ -2178,7 +2178,7 @@ discard block |
||
| 2178 | 2178 | } |
| 2179 | 2179 | |
| 2180 | 2180 | // Add Tags |
| 2181 | - $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2181 | + $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2182 | 2182 | foreach ($rows as $record) { |
| 2183 | 2183 | DB::insert( |
| 2184 | 2184 | prefixTable('tags'), |
@@ -2208,7 +2208,7 @@ discard block |
||
| 2208 | 2208 | $_SESSION['login'] |
| 2209 | 2209 | ); |
| 2210 | 2210 | // reload cache table |
| 2211 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 2211 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 2212 | 2212 | updateCacheTable('reload', $SETTINGS, null); |
| 2213 | 2213 | |
| 2214 | 2214 | echo (string) prepareExchangedData( |
@@ -2256,7 +2256,7 @@ discard block |
||
| 2256 | 2256 | |
| 2257 | 2257 | // Decrypt and retreive data in JSON format |
| 2258 | 2258 | $dataReceived = prepareExchangedData( |
| 2259 | - $SETTINGS['cpassman_dir'],$inputData['data'], |
|
| 2259 | + $SETTINGS['cpassman_dir'], $inputData['data'], |
|
| 2260 | 2260 | 'decode' |
| 2261 | 2261 | ); |
| 2262 | 2262 | |
@@ -2282,7 +2282,7 @@ discard block |
||
| 2282 | 2282 | // then we can show it |
| 2283 | 2283 | $item_deleted = DB::queryFirstRow( |
| 2284 | 2284 | 'SELECT * |
| 2285 | - FROM ' . prefixTable('log_items') . ' |
|
| 2285 | + FROM ' . prefixTable('log_items').' |
|
| 2286 | 2286 | WHERE id_item = %i AND action = %s |
| 2287 | 2287 | ORDER BY date DESC |
| 2288 | 2288 | LIMIT 0, 1', |
@@ -2293,7 +2293,7 @@ discard block |
||
| 2293 | 2293 | |
| 2294 | 2294 | $item_restored = DB::queryFirstRow( |
| 2295 | 2295 | 'SELECT * |
| 2296 | - FROM ' . prefixTable('log_items') . ' |
|
| 2296 | + FROM ' . prefixTable('log_items').' |
|
| 2297 | 2297 | WHERE id_item = %i AND action = %s |
| 2298 | 2298 | ORDER BY date DESC |
| 2299 | 2299 | LIMIT 0, 1', |
@@ -2318,8 +2318,8 @@ discard block |
||
| 2318 | 2318 | // Get all informations for this item |
| 2319 | 2319 | $dataItem = DB::queryfirstrow( |
| 2320 | 2320 | 'SELECT * |
| 2321 | - FROM ' . prefixTable('items') . ' as i |
|
| 2322 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2321 | + FROM ' . prefixTable('items').' as i |
|
| 2322 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2323 | 2323 | WHERE i.id = %i AND l.action = %s', |
| 2324 | 2324 | $inputData['id'], |
| 2325 | 2325 | 'at_creation' |
@@ -2328,7 +2328,7 @@ discard block |
||
| 2328 | 2328 | // Notification |
| 2329 | 2329 | DB::queryfirstrow( |
| 2330 | 2330 | 'SELECT * |
| 2331 | - FROM ' . prefixTable('notification') . ' |
|
| 2331 | + FROM ' . prefixTable('notification').' |
|
| 2332 | 2332 | WHERE item_id = %i AND user_id = %i', |
| 2333 | 2333 | $inputData['id'], |
| 2334 | 2334 | $_SESSION['user_id'] |
@@ -2375,13 +2375,13 @@ discard block |
||
| 2375 | 2375 | && (int) $SETTINGS['enable_email_notification_on_item_shown'] === 1 |
| 2376 | 2376 | && (int) $user['admin'] === 1 |
| 2377 | 2377 | ) { |
| 2378 | - $_SESSION['listNotificationEmails'] .= $user['email'] . ','; |
|
| 2378 | + $_SESSION['listNotificationEmails'] .= $user['email'].','; |
|
| 2379 | 2379 | } |
| 2380 | 2380 | } |
| 2381 | 2381 | |
| 2382 | 2382 | // manage case of API user |
| 2383 | 2383 | if ($dataItem['id_user'] === API_USER_ID) { |
| 2384 | - $arrData['author'] = 'API [' . $dataItem['description'] . ']'; |
|
| 2384 | + $arrData['author'] = 'API ['.$dataItem['description'].']'; |
|
| 2385 | 2385 | $arrData['id_user'] = API_USER_ID; |
| 2386 | 2386 | $arrData['author_email'] = ''; |
| 2387 | 2387 | $arrData['notification_status'] = false; |
@@ -2391,7 +2391,7 @@ discard block |
||
| 2391 | 2391 | $tags = array(); |
| 2392 | 2392 | $rows = DB::query( |
| 2393 | 2393 | 'SELECT tag |
| 2394 | - FROM ' . prefixTable('tags') . ' |
|
| 2394 | + FROM ' . prefixTable('tags').' |
|
| 2395 | 2395 | WHERE item_id = %i', |
| 2396 | 2396 | $inputData['id'] |
| 2397 | 2397 | ); |
@@ -2416,7 +2416,7 @@ discard block |
||
| 2416 | 2416 | // Check if user has a role that is accepted |
| 2417 | 2417 | $rows_tmp = DB::query( |
| 2418 | 2418 | 'SELECT role_id |
| 2419 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 2419 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 2420 | 2420 | WHERE item_id=%i', |
| 2421 | 2421 | $inputData['id'] |
| 2422 | 2422 | ); |
@@ -2430,7 +2430,7 @@ discard block |
||
| 2430 | 2430 | // Get the object key for the user |
| 2431 | 2431 | $userKey = DB::queryFirstRow( |
| 2432 | 2432 | 'SELECT share_key |
| 2433 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2433 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2434 | 2434 | WHERE user_id = %i AND object_id = %i', |
| 2435 | 2435 | $_SESSION['user_id'], |
| 2436 | 2436 | $inputData['id'] |
@@ -2529,8 +2529,8 @@ discard block |
||
| 2529 | 2529 | // Add restriction if item is restricted to roles |
| 2530 | 2530 | $rows = DB::query( |
| 2531 | 2531 | 'SELECT t.title, t.id |
| 2532 | - FROM ' . prefixTable('roles_title') . ' AS t |
|
| 2533 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id) |
|
| 2532 | + FROM ' . prefixTable('roles_title').' AS t |
|
| 2533 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id) |
|
| 2534 | 2534 | WHERE r.item_id = %i |
| 2535 | 2535 | ORDER BY t.title ASC', |
| 2536 | 2536 | $inputData['id'] |
@@ -2546,8 +2546,8 @@ discard block |
||
| 2546 | 2546 | $tmp = array(); |
| 2547 | 2547 | $rows = DB::query( |
| 2548 | 2548 | 'SELECT k.label, k.id |
| 2549 | - FROM ' . prefixTable('kb_items') . ' as i |
|
| 2550 | - INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id) |
|
| 2549 | + FROM ' . prefixTable('kb_items').' as i |
|
| 2550 | + INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id) |
|
| 2551 | 2551 | WHERE i.item_id = %i |
| 2552 | 2552 | ORDER BY k.label ASC', |
| 2553 | 2553 | $inputData['id'] |
@@ -2628,7 +2628,7 @@ discard block |
||
| 2628 | 2628 | $arrCatList = array(); |
| 2629 | 2629 | $rows_tmp = DB::query( |
| 2630 | 2630 | 'SELECT id_category |
| 2631 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 2631 | + FROM ' . prefixTable('categories_folders').' |
|
| 2632 | 2632 | WHERE id_folder=%i', |
| 2633 | 2633 | $inputData['folderId'] |
| 2634 | 2634 | ); |
@@ -2643,8 +2643,8 @@ discard block |
||
| 2643 | 2643 | 'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id, |
| 2644 | 2644 | i.encryption_type AS encryption_type, c.encrypted_data, c.parent_id AS parent_id, |
| 2645 | 2645 | c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility |
| 2646 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 2647 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 2646 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 2647 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 2648 | 2648 | WHERE i.item_id=%i AND c.parent_id IN %ls', |
| 2649 | 2649 | $inputData['id'], |
| 2650 | 2650 | $arrCatList |
@@ -2655,11 +2655,11 @@ discard block |
||
| 2655 | 2655 | //db::debugmode(true); |
| 2656 | 2656 | $userKey = DB::queryFirstRow( |
| 2657 | 2657 | 'SELECT share_key |
| 2658 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2658 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2659 | 2659 | WHERE user_id = %i AND object_id = %i', |
| 2660 | 2660 | $_SESSION['user_id'], |
| 2661 | 2661 | $row['id'] |
| 2662 | - );//db::debugmode(false); |
|
| 2662 | + ); //db::debugmode(false); |
|
| 2663 | 2663 | $fieldText = []; |
| 2664 | 2664 | if (DB::count() === 0) { |
| 2665 | 2665 | // Not encrypted |
@@ -2701,7 +2701,7 @@ discard block |
||
| 2701 | 2701 | if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) { |
| 2702 | 2702 | $rows_tmp = DB::queryfirstrow( |
| 2703 | 2703 | 'SELECT category_id |
| 2704 | - FROM ' . prefixTable('templates') . ' |
|
| 2704 | + FROM ' . prefixTable('templates').' |
|
| 2705 | 2705 | WHERE item_id = %i', |
| 2706 | 2706 | $inputData['id'] |
| 2707 | 2707 | ); |
@@ -2726,7 +2726,7 @@ discard block |
||
| 2726 | 2726 | // Is the Item to be deleted? |
| 2727 | 2727 | $dataDelete = DB::queryfirstrow( |
| 2728 | 2728 | 'SELECT * |
| 2729 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 2729 | + FROM ' . prefixTable('automatic_del').' |
|
| 2730 | 2730 | WHERE item_id = %i', |
| 2731 | 2731 | $inputData['id'] |
| 2732 | 2732 | ); |
@@ -2808,11 +2808,11 @@ discard block |
||
| 2808 | 2808 | if (empty($dataItem['restricted_to']) === false) { |
| 2809 | 2809 | foreach (explode(';', $dataItem['restricted_to']) as $userRest) { |
| 2810 | 2810 | if (empty($userRest) === false) { |
| 2811 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
| 2811 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
| 2812 | 2812 | if (empty($listOfRestricted)) { |
| 2813 | 2813 | $listOfRestricted = $dataTmp['login']; |
| 2814 | 2814 | } else { |
| 2815 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 2815 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 2816 | 2816 | } |
| 2817 | 2817 | } |
| 2818 | 2818 | } |
@@ -2875,8 +2875,8 @@ discard block |
||
| 2875 | 2875 | // Load item data |
| 2876 | 2876 | $dataItem = DB::queryFirstRow( |
| 2877 | 2877 | 'SELECT i.*, n.title AS folder_title |
| 2878 | - FROM ' . prefixTable('items') . ' AS i |
|
| 2879 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 2878 | + FROM ' . prefixTable('items').' AS i |
|
| 2879 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 2880 | 2880 | WHERE i.id = %i', |
| 2881 | 2881 | $inputData['id'] |
| 2882 | 2882 | ); |
@@ -2898,7 +2898,7 @@ discard block |
||
| 2898 | 2898 | // Check if user has a role that is accepted |
| 2899 | 2899 | $rows_tmp = DB::query( |
| 2900 | 2900 | 'SELECT role_id |
| 2901 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 2901 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 2902 | 2902 | WHERE item_id=%i', |
| 2903 | 2903 | $inputData['id'] |
| 2904 | 2904 | ); |
@@ -2945,7 +2945,7 @@ discard block |
||
| 2945 | 2945 | // launch query |
| 2946 | 2946 | $rows = DB::query( |
| 2947 | 2947 | 'SELECT id, name, file, extension, size |
| 2948 | - FROM ' . prefixTable('files') . ' |
|
| 2948 | + FROM ' . prefixTable('files').' |
|
| 2949 | 2949 | WHERE id_item = %i AND confirmed = 1', |
| 2950 | 2950 | $inputData['id'] |
| 2951 | 2951 | ); |
@@ -2954,7 +2954,7 @@ discard block |
||
| 2954 | 2954 | $attachments, |
| 2955 | 2955 | array( |
| 2956 | 2956 | 'icon' => fileFormatImage(strtolower($record['extension'])), |
| 2957 | - 'filename' => basename($record['name'], '.' . $record['extension']), |
|
| 2957 | + 'filename' => basename($record['name'], '.'.$record['extension']), |
|
| 2958 | 2958 | 'extension' => $record['extension'], |
| 2959 | 2959 | 'size' => formatSizeUnits((int) $record['size']), |
| 2960 | 2960 | 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, |
@@ -2980,7 +2980,7 @@ discard block |
||
| 2980 | 2980 | array( |
| 2981 | 2981 | 'latest_items' => implode(';', $_SESSION['latest_items']), |
| 2982 | 2982 | ), |
| 2983 | - 'id=' . $_SESSION['user_id'] |
|
| 2983 | + 'id='.$_SESSION['user_id'] |
|
| 2984 | 2984 | ); |
| 2985 | 2985 | } |
| 2986 | 2986 | |
@@ -2989,8 +2989,8 @@ discard block |
||
| 2989 | 2989 | $listOptionsForRoles = array(); |
| 2990 | 2990 | $rows = DB::query( |
| 2991 | 2991 | 'SELECT r.role_id AS role_id, t.title AS title |
| 2992 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 2993 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 2992 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 2993 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 2994 | 2994 | WHERE r.folder_id = %i', |
| 2995 | 2995 | $dataItem['id_tree'] |
| 2996 | 2996 | ); |
@@ -3004,9 +3004,9 @@ discard block |
||
| 3004 | 3004 | ); |
| 3005 | 3005 | $rows2 = DB::query( |
| 3006 | 3006 | 'SELECT id, login, fonction_id, email, name, lastname |
| 3007 | - FROM ' . prefixTable('users') . ' |
|
| 3007 | + FROM ' . prefixTable('users').' |
|
| 3008 | 3008 | WHERE fonction_id LIKE %s', |
| 3009 | - '%' . $record['role_id'] . '%' |
|
| 3009 | + '%'.$record['role_id'].'%' |
|
| 3010 | 3010 | ); |
| 3011 | 3011 | foreach ($rows2 as $record2) { |
| 3012 | 3012 | foreach (explode(';', $record2['fonction_id']) as $role) { |
@@ -3019,7 +3019,7 @@ discard block |
||
| 3019 | 3019 | array( |
| 3020 | 3020 | 'id' => (int) $record2['id'], |
| 3021 | 3021 | 'login' => $record2['login'], |
| 3022 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 3022 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 3023 | 3023 | 'email' => $record2['email'], |
| 3024 | 3024 | ) |
| 3025 | 3025 | ); |
@@ -3038,16 +3038,16 @@ discard block |
||
| 3038 | 3038 | $path = ''; |
| 3039 | 3039 | foreach ($arbo as $elem) { |
| 3040 | 3040 | if (empty($path) === true) { |
| 3041 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 3041 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 3042 | 3042 | } else { |
| 3043 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3043 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3044 | 3044 | } |
| 3045 | 3045 | } |
| 3046 | 3046 | // Build text to show user |
| 3047 | 3047 | if (empty($path) === true) { |
| 3048 | 3048 | $path = addslashes($dataItem['label']); |
| 3049 | 3049 | } else { |
| 3050 | - $path = addslashes($dataItem['label']) . ' (' . $path . ')'; |
|
| 3050 | + $path = addslashes($dataItem['label']).' ('.$path.')'; |
|
| 3051 | 3051 | } |
| 3052 | 3052 | |
| 3053 | 3053 | // send back infos |
@@ -3061,7 +3061,7 @@ discard block |
||
| 3061 | 3061 | array( |
| 3062 | 3062 | addslashes($_SESSION['login']), |
| 3063 | 3063 | $path, |
| 3064 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'], |
|
| 3064 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'], |
|
| 3065 | 3065 | ), |
| 3066 | 3066 | langHdl('email_on_open_notification_mail') |
| 3067 | 3067 | ), |
@@ -3072,7 +3072,7 @@ discard block |
||
| 3072 | 3072 | } |
| 3073 | 3073 | |
| 3074 | 3074 | // has this item a change proposal |
| 3075 | - DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']); |
|
| 3075 | + DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']); |
|
| 3076 | 3076 | $returnArray['has_change_proposal'] = DB::count(); |
| 3077 | 3077 | |
| 3078 | 3078 | // Setting |
@@ -3170,7 +3170,7 @@ discard block |
||
| 3170 | 3170 | // Load item data |
| 3171 | 3171 | $data = DB::queryFirstRow( |
| 3172 | 3172 | 'SELECT id_tree |
| 3173 | - FROM ' . prefixTable('items') . ' |
|
| 3173 | + FROM ' . prefixTable('items').' |
|
| 3174 | 3174 | WHERE id = %i', |
| 3175 | 3175 | $inputData['itemId'] |
| 3176 | 3176 | ); |
@@ -3236,7 +3236,7 @@ discard block |
||
| 3236 | 3236 | } |
| 3237 | 3237 | // decrypt and retreive data in JSON format |
| 3238 | 3238 | $dataReceived = prepareExchangedData( |
| 3239 | - $SETTINGS['cpassman_dir'],$inputData['data'], 'decode'); |
|
| 3239 | + $SETTINGS['cpassman_dir'], $inputData['data'], 'decode'); |
|
| 3240 | 3240 | |
| 3241 | 3241 | // Prepare variables |
| 3242 | 3242 | $title = filter_var(htmlspecialchars_decode($dataReceived['title'], ENT_QUOTES), FILTER_SANITIZE_STRING); |
@@ -3244,13 +3244,13 @@ discard block |
||
| 3244 | 3244 | |
| 3245 | 3245 | // Check if user is allowed to access this folder |
| 3246 | 3246 | if (!in_array($inputData['folderId'], $_SESSION['groupes_visibles'])) { |
| 3247 | - echo '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3247 | + echo '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3248 | 3248 | break; |
| 3249 | 3249 | } |
| 3250 | 3250 | |
| 3251 | 3251 | // Check if title doesn't contains html codes |
| 3252 | 3252 | if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) { |
| 3253 | - echo '[ { "error" : "' . langHdl('error_html_codes') . '" } ]'; |
|
| 3253 | + echo '[ { "error" : "'.langHdl('error_html_codes').'" } ]'; |
|
| 3254 | 3254 | break; |
| 3255 | 3255 | } |
| 3256 | 3256 | // check that title is not numeric |
@@ -3261,9 +3261,9 @@ discard block |
||
| 3261 | 3261 | |
| 3262 | 3262 | // Check if duplicate folders name are allowed |
| 3263 | 3263 | if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') { |
| 3264 | - $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title); |
|
| 3264 | + $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title); |
|
| 3265 | 3265 | if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) { |
| 3266 | - echo '[ { "error" : "' . langHdl('error_group_exist') . '" } ]'; |
|
| 3266 | + echo '[ { "error" : "'.langHdl('error_group_exist').'" } ]'; |
|
| 3267 | 3267 | break; |
| 3268 | 3268 | } |
| 3269 | 3269 | } |
@@ -3271,7 +3271,7 @@ discard block |
||
| 3271 | 3271 | // query on folder |
| 3272 | 3272 | $data = DB::queryfirstrow( |
| 3273 | 3273 | 'SELECT parent_id, personal_folder |
| 3274 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3274 | + FROM ' . prefixTable('nested_tree').' |
|
| 3275 | 3275 | WHERE id = %i', |
| 3276 | 3276 | $inputData['folderId'] |
| 3277 | 3277 | ); |
@@ -3281,20 +3281,20 @@ discard block |
||
| 3281 | 3281 | if ($_SESSION['is_admin'] !== 1 && $_SESSION['user_manager'] !== 1 && $data['personal_folder'] === '0') { |
| 3282 | 3282 | $data = DB::queryfirstrow( |
| 3283 | 3283 | 'SELECT valeur |
| 3284 | - FROM ' . prefixTable('misc') . ' |
|
| 3284 | + FROM ' . prefixTable('misc').' |
|
| 3285 | 3285 | WHERE intitule = %i AND type = %s', |
| 3286 | 3286 | $data['parent_id'], |
| 3287 | 3287 | 'complex' |
| 3288 | 3288 | ); |
| 3289 | 3289 | if (intval($dataReceived['complexity']) < intval($data['valeur'])) { |
| 3290 | - echo '[ { "error" : "' . langHdl('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]'; |
|
| 3290 | + echo '[ { "error" : "'.langHdl('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]'; |
|
| 3291 | 3291 | break; |
| 3292 | 3292 | } |
| 3293 | 3293 | } |
| 3294 | 3294 | |
| 3295 | 3295 | // update Folders table |
| 3296 | 3296 | $tmp = DB::queryFirstRow( |
| 3297 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 3297 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 3298 | 3298 | $dataReceived['folder'] |
| 3299 | 3299 | ); |
| 3300 | 3300 | if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $_SESSION['user_id'] || $tmp['personal_folder'] !== 1) { |
@@ -3353,7 +3353,7 @@ discard block |
||
| 3353 | 3353 | } |
| 3354 | 3354 | // decrypt and retreive data in JSON format |
| 3355 | 3355 | $dataReceived = prepareExchangedData( |
| 3356 | - $SETTINGS['cpassman_dir'],$inputData['data'], 'decode'); |
|
| 3356 | + $SETTINGS['cpassman_dir'], $inputData['data'], 'decode'); |
|
| 3357 | 3357 | $post_source_folder_id = filter_var(htmlspecialchars_decode($dataReceived['source_folder_id']), FILTER_SANITIZE_NUMBER_INT); |
| 3358 | 3358 | $post_target_folder_id = filter_var(htmlspecialchars_decode($dataReceived['target_folder_id']), FILTER_SANITIZE_NUMBER_INT); |
| 3359 | 3359 | |
@@ -3362,42 +3362,42 @@ discard block |
||
| 3362 | 3362 | in_array($post_target_folder_id, $_SESSION['groupes_visibles']) === false) && ($post_target_folder_id === '0' && |
| 3363 | 3363 | isset($SETTINGS['can_create_root_folder']) === true && (int) $SETTINGS['can_create_root_folder'] === 1) |
| 3364 | 3364 | ) { |
| 3365 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3365 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3366 | 3366 | echo $returnValues; |
| 3367 | 3367 | break; |
| 3368 | 3368 | } |
| 3369 | 3369 | |
| 3370 | 3370 | $tmp_source = DB::queryFirstRow( |
| 3371 | 3371 | 'SELECT title, parent_id, personal_folder |
| 3372 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3372 | + FROM ' . prefixTable('nested_tree').' |
|
| 3373 | 3373 | WHERE id = %i', |
| 3374 | 3374 | $post_source_folder_id |
| 3375 | 3375 | ); |
| 3376 | 3376 | |
| 3377 | 3377 | $tmp_target = DB::queryFirstRow( |
| 3378 | 3378 | 'SELECT title, parent_id, personal_folder |
| 3379 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3379 | + FROM ' . prefixTable('nested_tree').' |
|
| 3380 | 3380 | WHERE id = %i', |
| 3381 | 3381 | $post_target_folder_id |
| 3382 | 3382 | ); |
| 3383 | 3383 | |
| 3384 | 3384 | // check if target is not a child of source |
| 3385 | 3385 | if ($tree->isChildOf($post_target_folder_id, $post_source_folder_id) === true) { |
| 3386 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3386 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3387 | 3387 | echo $returnValues; |
| 3388 | 3388 | break; |
| 3389 | 3389 | } |
| 3390 | 3390 | |
| 3391 | 3391 | // check if source or target folder is PF. If Yes, then cancel operation |
| 3392 | 3392 | if ((int) $tmp_source['personal_folder'] === 1 || (int) $tmp_target['personal_folder'] === 1) { |
| 3393 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3393 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3394 | 3394 | echo $returnValues; |
| 3395 | 3395 | break; |
| 3396 | 3396 | } |
| 3397 | 3397 | |
| 3398 | 3398 | // check if source or target folder is PF. If Yes, then cancel operation |
| 3399 | 3399 | if ($tmp_source['title'] === $_SESSION['user_id'] || $tmp_target['title'] === $_SESSION['user_id']) { |
| 3400 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3400 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3401 | 3401 | echo $returnValues; |
| 3402 | 3402 | break; |
| 3403 | 3403 | } |
@@ -3534,7 +3534,7 @@ discard block |
||
| 3534 | 3534 | foreach ($_SESSION['user_roles'] as $role) { |
| 3535 | 3535 | $roleQ = DB::queryfirstrow( |
| 3536 | 3536 | 'SELECT allow_pw_change |
| 3537 | - FROM ' . prefixTable('roles_title') . ' |
|
| 3537 | + FROM ' . prefixTable('roles_title').' |
|
| 3538 | 3538 | WHERE id = %i', |
| 3539 | 3539 | $role |
| 3540 | 3540 | ); |
@@ -3559,11 +3559,11 @@ discard block |
||
| 3559 | 3559 | |
| 3560 | 3560 | foreach ($_SESSION['user_roles'] as $role) { |
| 3561 | 3561 | $access = DB::queryFirstRow( |
| 3562 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
| 3562 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
| 3563 | 3563 | $role, |
| 3564 | 3564 | $inputData['id'] |
| 3565 | 3565 | ); |
| 3566 | - if (DB::count()>0) { |
|
| 3566 | + if (DB::count() > 0) { |
|
| 3567 | 3567 | if ($access['type'] === 'R') { |
| 3568 | 3568 | array_push($arrTmp, 10); |
| 3569 | 3569 | } elseif ($access['type'] === 'W') { |
@@ -3628,7 +3628,7 @@ discard block |
||
| 3628 | 3628 | } else { |
| 3629 | 3629 | DB::query( |
| 3630 | 3630 | 'SELECT * |
| 3631 | - FROM ' . prefixTable('items') . ' |
|
| 3631 | + FROM ' . prefixTable('items').' |
|
| 3632 | 3632 | WHERE inactif = %i', |
| 3633 | 3633 | 0 |
| 3634 | 3634 | ); |
@@ -3638,7 +3638,7 @@ discard block |
||
| 3638 | 3638 | |
| 3639 | 3639 | // Get folder complexity |
| 3640 | 3640 | $folderComplexity = DB::queryFirstRow( |
| 3641 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i', |
|
| 3641 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i', |
|
| 3642 | 3642 | 'complex', |
| 3643 | 3643 | $inputData['id'] |
| 3644 | 3644 | ); |
@@ -3650,7 +3650,7 @@ discard block |
||
| 3650 | 3650 | if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) { |
| 3651 | 3651 | $folderRow = DB::query( |
| 3652 | 3652 | 'SELECT id_category |
| 3653 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 3653 | + FROM ' . prefixTable('categories_folders').' |
|
| 3654 | 3654 | WHERE id_folder = %i', |
| 3655 | 3655 | $inputData['id'] |
| 3656 | 3656 | ); |
@@ -3764,13 +3764,13 @@ discard block |
||
| 3764 | 3764 | // List all ITEMS |
| 3765 | 3765 | if ($folderIsPf === false) { |
| 3766 | 3766 | $where->add('i.inactif=%i', 0); |
| 3767 | - $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)"); |
|
| 3767 | + $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)"); |
|
| 3768 | 3768 | if (empty($limited_to_items) === false) { |
| 3769 | 3769 | $where->add('i.id IN %ls', explode(',', $limited_to_items)); |
| 3770 | 3770 | } |
| 3771 | 3771 | |
| 3772 | - $query_limit = ' LIMIT ' . |
|
| 3773 | - $start . ',' . |
|
| 3772 | + $query_limit = ' LIMIT '. |
|
| 3773 | + $start.','. |
|
| 3774 | 3774 | $post_nb_items_to_display_once; |
| 3775 | 3775 | //db::debugmode(true); |
| 3776 | 3776 | $rows = DB::query( |
@@ -3781,9 +3781,9 @@ discard block |
||
| 3781 | 3781 | MIN(l.action) AS log_action, |
| 3782 | 3782 | l.id_user AS log_user, |
| 3783 | 3783 | i.url AS link |
| 3784 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3785 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 3786 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 3784 | + FROM ' . prefixTable('items').' AS i |
|
| 3785 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 3786 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 3787 | 3787 | WHERE %l |
| 3788 | 3788 | GROUP BY i.id, l.date, l.id_user, l.action |
| 3789 | 3789 | ORDER BY i.label ASC, l.date DESC' . $query_limit, |
@@ -3802,9 +3802,9 @@ discard block |
||
| 3802 | 3802 | MIN(l.action) AS log_action, |
| 3803 | 3803 | l.id_user AS log_user, |
| 3804 | 3804 | i.url AS link |
| 3805 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3806 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 3807 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 3805 | + FROM ' . prefixTable('items').' AS i |
|
| 3806 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 3807 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 3808 | 3808 | WHERE %l |
| 3809 | 3809 | GROUP BY i.id, l.date, l.id_user, l.action |
| 3810 | 3810 | ORDER BY i.label ASC, l.date DESC', |
@@ -3834,7 +3834,7 @@ discard block |
||
| 3834 | 3834 | $item_is_restricted_to_role = false; |
| 3835 | 3835 | DB::queryfirstrow( |
| 3836 | 3836 | 'SELECT role_id |
| 3837 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 3837 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 3838 | 3838 | WHERE item_id = %i', |
| 3839 | 3839 | $record['id'] |
| 3840 | 3840 | ); |
@@ -3846,7 +3846,7 @@ discard block |
||
| 3846 | 3846 | $user_is_included_in_role = false; |
| 3847 | 3847 | DB::query( |
| 3848 | 3848 | 'SELECT role_id |
| 3849 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 3849 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 3850 | 3850 | WHERE item_id = %i AND role_id IN %ls', |
| 3851 | 3851 | $record['id'], |
| 3852 | 3852 | $_SESSION['user_roles'] |
@@ -4051,9 +4051,9 @@ discard block |
||
| 4051 | 4051 | if ((int) $start === 0) { |
| 4052 | 4052 | DB::query( |
| 4053 | 4053 | 'SELECT i.id |
| 4054 | - FROM ' . prefixTable('items') . ' as i |
|
| 4055 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
| 4056 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item) |
|
| 4054 | + FROM ' . prefixTable('items').' as i |
|
| 4055 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
| 4056 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item) |
|
| 4057 | 4057 | WHERE %l |
| 4058 | 4058 | ORDER BY i.label ASC, l.date DESC', |
| 4059 | 4059 | $where |
@@ -4119,8 +4119,8 @@ discard block |
||
| 4119 | 4119 | // Run query |
| 4120 | 4120 | $dataItem = DB::queryfirstrow( |
| 4121 | 4121 | 'SELECT i.pw AS pw, s.share_key AS share_key |
| 4122 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4123 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
| 4122 | + FROM ' . prefixTable('items').' AS i |
|
| 4123 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
| 4124 | 4124 | WHERE user_id = %i AND i.id = %i', |
| 4125 | 4125 | $_SESSION['user_id'], |
| 4126 | 4126 | $inputData['itemId'] |
@@ -4163,7 +4163,7 @@ discard block |
||
| 4163 | 4163 | if (null !== $inputData['itemId'] && empty($inputData['itemId']) === false) { |
| 4164 | 4164 | $dataItem = DB::queryfirstrow( |
| 4165 | 4165 | 'SELECT perso, anyone_can_modify |
| 4166 | - FROM ' . prefixTable('items') . ' |
|
| 4166 | + FROM ' . prefixTable('items').' |
|
| 4167 | 4167 | WHERE id=%i', |
| 4168 | 4168 | $inputData['itemId'] |
| 4169 | 4169 | ); |
@@ -4202,7 +4202,7 @@ discard block |
||
| 4202 | 4202 | */ |
| 4203 | 4203 | |
| 4204 | 4204 | // Lock Item (if already locked), go back and warn |
| 4205 | - $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 4205 | + $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', $inputData['itemId']); |
|
| 4206 | 4206 | |
| 4207 | 4207 | // If token is taken for this Item and delay is passed then delete it. |
| 4208 | 4208 | if ( |
@@ -4213,7 +4213,7 @@ discard block |
||
| 4213 | 4213 | DB::delete(prefixTable('items_edition'), 'item_id = %i', $inputData['itemId']); |
| 4214 | 4214 | //reload the previous data |
| 4215 | 4215 | $dataTmp = DB::queryFirstRow( |
| 4216 | - 'SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', |
|
| 4216 | + 'SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', |
|
| 4217 | 4217 | $inputData['itemId'] |
| 4218 | 4218 | ); |
| 4219 | 4219 | } |
@@ -4257,7 +4257,7 @@ discard block |
||
| 4257 | 4257 | // do query on this folder |
| 4258 | 4258 | $data_this_folder = DB::queryFirstRow( |
| 4259 | 4259 | 'SELECT id, personal_folder, title |
| 4260 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4260 | + FROM ' . prefixTable('nested_tree').' |
|
| 4261 | 4261 | WHERE id = %s', |
| 4262 | 4262 | $inputData['folderId'] |
| 4263 | 4263 | ); |
@@ -4298,8 +4298,8 @@ discard block |
||
| 4298 | 4298 | $visibilite = ''; |
| 4299 | 4299 | $data = DB::queryFirstRow( |
| 4300 | 4300 | 'SELECT m.valeur, n.personal_folder |
| 4301 | - FROM ' . prefixTable('misc') . ' AS m |
|
| 4302 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id) |
|
| 4301 | + FROM ' . prefixTable('misc').' AS m |
|
| 4302 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id) |
|
| 4303 | 4303 | WHERE type=%s AND intitule = %s', |
| 4304 | 4304 | 'complex', |
| 4305 | 4305 | $inputData['folderId'] |
@@ -4312,8 +4312,8 @@ discard block |
||
| 4312 | 4312 | // Prepare Item actual visibility (what Users/Roles can see it) |
| 4313 | 4313 | $rows = DB::query( |
| 4314 | 4314 | 'SELECT t.title |
| 4315 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 4316 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 4315 | + FROM ' . prefixTable('roles_values').' as v |
|
| 4316 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 4317 | 4317 | WHERE v.folder_id = %i |
| 4318 | 4318 | GROUP BY title', |
| 4319 | 4319 | $inputData['folderId'] |
@@ -4322,7 +4322,7 @@ discard block |
||
| 4322 | 4322 | if (empty($visibilite)) { |
| 4323 | 4323 | $visibilite = $record['title']; |
| 4324 | 4324 | } else { |
| 4325 | - $visibilite .= ' - ' . $record['title']; |
|
| 4325 | + $visibilite .= ' - '.$record['title']; |
|
| 4326 | 4326 | } |
| 4327 | 4327 | } |
| 4328 | 4328 | } else { |
@@ -4332,14 +4332,14 @@ discard block |
||
| 4332 | 4332 | // do new query to know if current folder is pf |
| 4333 | 4333 | $data_pf = DB::queryFirstRow( |
| 4334 | 4334 | 'SELECT personal_folder |
| 4335 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4335 | + FROM ' . prefixTable('nested_tree').' |
|
| 4336 | 4336 | WHERE id = %s', |
| 4337 | 4337 | $inputData['folderId'] |
| 4338 | 4338 | ); |
| 4339 | 4339 | |
| 4340 | 4340 | $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0; |
| 4341 | 4341 | |
| 4342 | - $visibilite = $_SESSION['name'] . ' ' . $_SESSION['lastname'] . ' (' . $_SESSION['login'] . ')'; |
|
| 4342 | + $visibilite = $_SESSION['name'].' '.$_SESSION['lastname'].' ('.$_SESSION['login'].')'; |
|
| 4343 | 4343 | } |
| 4344 | 4344 | |
| 4345 | 4345 | recupDroitCreationSansComplexite($inputData['folderId']); |
@@ -4349,8 +4349,8 @@ discard block |
||
| 4349 | 4349 | $listOptionsForRoles = array(); |
| 4350 | 4350 | $rows = DB::query( |
| 4351 | 4351 | 'SELECT r.role_id AS role_id, t.title AS title |
| 4352 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 4353 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 4352 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 4353 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 4354 | 4354 | WHERE r.folder_id = %i', |
| 4355 | 4355 | $inputData['folderId'] |
| 4356 | 4356 | ); |
@@ -4364,7 +4364,7 @@ discard block |
||
| 4364 | 4364 | ); |
| 4365 | 4365 | $rows2 = DB::query( |
| 4366 | 4366 | 'SELECT id, login, fonction_id, email, name, lastname |
| 4367 | - FROM ' . prefixTable('users') . ' |
|
| 4367 | + FROM ' . prefixTable('users').' |
|
| 4368 | 4368 | WHERE admin = 0' |
| 4369 | 4369 | ); |
| 4370 | 4370 | foreach ($rows2 as $record2) { |
@@ -4378,7 +4378,7 @@ discard block |
||
| 4378 | 4378 | array( |
| 4379 | 4379 | 'id' => $record2['id'], |
| 4380 | 4380 | 'login' => $record2['login'], |
| 4381 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 4381 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 4382 | 4382 | 'email' => $record2['email'], |
| 4383 | 4383 | ) |
| 4384 | 4384 | ); |
@@ -4395,13 +4395,13 @@ discard block |
||
| 4395 | 4395 | //db::debugmode(true); |
| 4396 | 4396 | $access = DB::queryFirstRow( |
| 4397 | 4397 | 'SELECT type |
| 4398 | - FROM ' . prefixTable('roles_values') . ' |
|
| 4398 | + FROM ' . prefixTable('roles_values').' |
|
| 4399 | 4399 | WHERE role_id = %i AND folder_id = %i', |
| 4400 | 4400 | $role, |
| 4401 | 4401 | $inputData['folderId'] |
| 4402 | 4402 | ); |
| 4403 | 4403 | //db::debugmode(false); |
| 4404 | - if (DB::count()>0) { |
|
| 4404 | + if (DB::count() > 0) { |
|
| 4405 | 4405 | if ($access['type'] === 'R') { |
| 4406 | 4406 | array_push($arrTmp, 10); |
| 4407 | 4407 | } elseif ($access['type'] === 'W') { |
@@ -4442,7 +4442,7 @@ discard block |
||
| 4442 | 4442 | 'itemAccessRight' => isset($accessLevel) === true ? $accessLevel : '', |
| 4443 | 4443 | ); |
| 4444 | 4444 | echo (string) prepareExchangedData( |
| 4445 | - $SETTINGS['cpassman_dir'],$returnValues, 'encode'); |
|
| 4445 | + $SETTINGS['cpassman_dir'], $returnValues, 'encode'); |
|
| 4446 | 4446 | break; |
| 4447 | 4447 | |
| 4448 | 4448 | /* |
@@ -4474,7 +4474,7 @@ discard block |
||
| 4474 | 4474 | // Get some info before deleting |
| 4475 | 4475 | $data = DB::queryFirstRow( |
| 4476 | 4476 | 'SELECT name, id_item, file |
| 4477 | - FROM ' . prefixTable('files') . ' |
|
| 4477 | + FROM ' . prefixTable('files').' |
|
| 4478 | 4478 | WHERE id = %i', |
| 4479 | 4479 | $fileId |
| 4480 | 4480 | ); |
@@ -4482,7 +4482,7 @@ discard block |
||
| 4482 | 4482 | // Load item data |
| 4483 | 4483 | $data_item = DB::queryFirstRow( |
| 4484 | 4484 | 'SELECT id_tree |
| 4485 | - FROM ' . prefixTable('items') . ' |
|
| 4485 | + FROM ' . prefixTable('items').' |
|
| 4486 | 4486 | WHERE id = %i', |
| 4487 | 4487 | $data['id_item'] |
| 4488 | 4488 | ); |
@@ -4513,7 +4513,7 @@ discard block |
||
| 4513 | 4513 | $_SESSION['user_id'], |
| 4514 | 4514 | 'at_modification', |
| 4515 | 4515 | $_SESSION['login'], |
| 4516 | - 'at_del_file : ' . $data['name'] |
|
| 4516 | + 'at_del_file : '.$data['name'] |
|
| 4517 | 4517 | ); |
| 4518 | 4518 | |
| 4519 | 4519 | // DElete sharekeys |
@@ -4524,7 +4524,7 @@ discard block |
||
| 4524 | 4524 | ); |
| 4525 | 4525 | |
| 4526 | 4526 | // Delete file from server |
| 4527 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']), $SETTINGS); |
|
| 4527 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']), $SETTINGS); |
|
| 4528 | 4528 | } |
| 4529 | 4529 | |
| 4530 | 4530 | echo (string) prepareExchangedData( |
@@ -4568,12 +4568,12 @@ discard block |
||
| 4568 | 4568 | // Update SESSION with this new favourite |
| 4569 | 4569 | $data = DB::queryfirstrow( |
| 4570 | 4570 | 'SELECT label,id_tree |
| 4571 | - FROM ' . prefixTable('items') . ' |
|
| 4571 | + FROM ' . prefixTable('items').' |
|
| 4572 | 4572 | WHERE id = ' . mysqli_real_escape_string($link, $inputData['itemId']) |
| 4573 | 4573 | ); |
| 4574 | 4574 | $_SESSION['favourites_tab'][$inputData['itemId']] = array( |
| 4575 | 4575 | 'label' => $data['label'], |
| 4576 | - 'url' => 'index.php?page=items&group=' . $data['id_tree'] . '&id=' . $inputData['itemId'], |
|
| 4576 | + 'url' => 'index.php?page=items&group='.$data['id_tree'].'&id='.$inputData['itemId'], |
|
| 4577 | 4577 | ); |
| 4578 | 4578 | } elseif ((int) $inputData['destination'] === 1) { |
| 4579 | 4579 | // delete from session |
@@ -4645,8 +4645,8 @@ discard block |
||
| 4645 | 4645 | // get data about item |
| 4646 | 4646 | $dataSource = DB::queryfirstrow( |
| 4647 | 4647 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 4648 | - FROM ' . prefixTable('items') . ' as i |
|
| 4649 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 4648 | + FROM ' . prefixTable('items').' as i |
|
| 4649 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 4650 | 4650 | WHERE i.id=%i', |
| 4651 | 4651 | $inputData['itemId'] |
| 4652 | 4652 | ); |
@@ -4654,7 +4654,7 @@ discard block |
||
| 4654 | 4654 | // get data about new folder |
| 4655 | 4655 | $dataDestination = DB::queryfirstrow( |
| 4656 | 4656 | 'SELECT personal_folder, title |
| 4657 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4657 | + FROM ' . prefixTable('nested_tree').' |
|
| 4658 | 4658 | WHERE id = %i', |
| 4659 | 4659 | $inputData['folderId'] |
| 4660 | 4660 | ); |
@@ -4707,7 +4707,7 @@ discard block |
||
| 4707 | 4707 | // Get fields for this Item |
| 4708 | 4708 | $rows = DB::query( |
| 4709 | 4709 | 'SELECT id |
| 4710 | - FROM ' . prefixTable('categories_items') . ' |
|
| 4710 | + FROM ' . prefixTable('categories_items').' |
|
| 4711 | 4711 | WHERE item_id = %i', |
| 4712 | 4712 | $inputData['itemId'] |
| 4713 | 4713 | ); |
@@ -4724,7 +4724,7 @@ discard block |
||
| 4724 | 4724 | // Get FILES for this Item |
| 4725 | 4725 | $rows = DB::query( |
| 4726 | 4726 | 'SELECT id |
| 4727 | - FROM ' . prefixTable('files') . ' |
|
| 4727 | + FROM ' . prefixTable('files').' |
|
| 4728 | 4728 | WHERE id_item = %i', |
| 4729 | 4729 | $inputData['itemId'] |
| 4730 | 4730 | ); |
@@ -4769,7 +4769,7 @@ discard block |
||
| 4769 | 4769 | // Get the ITEM object key for the user |
| 4770 | 4770 | $userKey = DB::queryFirstRow( |
| 4771 | 4771 | 'SELECT share_key |
| 4772 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 4772 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 4773 | 4773 | WHERE user_id = %i AND object_id = %i', |
| 4774 | 4774 | $_SESSION['user_id'], |
| 4775 | 4775 | $inputData['itemId'] |
@@ -4780,8 +4780,8 @@ discard block |
||
| 4780 | 4780 | // This is a public object |
| 4781 | 4781 | $users = DB::query( |
| 4782 | 4782 | 'SELECT id, public_key |
| 4783 | - FROM ' . prefixTable('users') . ' |
|
| 4784 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 4783 | + FROM ' . prefixTable('users').' |
|
| 4784 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 4785 | 4785 | AND public_key != ""' |
| 4786 | 4786 | ); |
| 4787 | 4787 | foreach ($users as $user) { |
@@ -4801,14 +4801,14 @@ discard block |
||
| 4801 | 4801 | // Get fields for this Item |
| 4802 | 4802 | $rows = DB::query( |
| 4803 | 4803 | 'SELECT id |
| 4804 | - FROM ' . prefixTable('categories_items') . ' |
|
| 4804 | + FROM ' . prefixTable('categories_items').' |
|
| 4805 | 4805 | WHERE item_id = %i', |
| 4806 | 4806 | $inputData['itemId'] |
| 4807 | 4807 | ); |
| 4808 | 4808 | foreach ($rows as $field) { |
| 4809 | 4809 | $userKey = DB::queryFirstRow( |
| 4810 | 4810 | 'SELECT share_key |
| 4811 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 4811 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 4812 | 4812 | WHERE user_id = %i AND object_id = %i', |
| 4813 | 4813 | $_SESSION['user_id'], |
| 4814 | 4814 | $field['id'] |
@@ -4819,8 +4819,8 @@ discard block |
||
| 4819 | 4819 | // This is a public object |
| 4820 | 4820 | $users = DB::query( |
| 4821 | 4821 | 'SELECT id, public_key |
| 4822 | - FROM ' . prefixTable('users') . ' |
|
| 4823 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 4822 | + FROM ' . prefixTable('users').' |
|
| 4823 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 4824 | 4824 | AND public_key != ""' |
| 4825 | 4825 | ); |
| 4826 | 4826 | foreach ($users as $user) { |
@@ -4841,14 +4841,14 @@ discard block |
||
| 4841 | 4841 | // Get FILES for this Item |
| 4842 | 4842 | $rows = DB::query( |
| 4843 | 4843 | 'SELECT id |
| 4844 | - FROM ' . prefixTable('files') . ' |
|
| 4844 | + FROM ' . prefixTable('files').' |
|
| 4845 | 4845 | WHERE id_item = %i', |
| 4846 | 4846 | $inputData['itemId'] |
| 4847 | 4847 | ); |
| 4848 | 4848 | foreach ($rows as $attachment) { |
| 4849 | 4849 | $userKey = DB::queryFirstRow( |
| 4850 | 4850 | 'SELECT share_key |
| 4851 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 4851 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 4852 | 4852 | WHERE user_id = %i AND object_id = %i', |
| 4853 | 4853 | $_SESSION['user_id'], |
| 4854 | 4854 | $attachment['id'] |
@@ -4859,8 +4859,8 @@ discard block |
||
| 4859 | 4859 | // This is a public object |
| 4860 | 4860 | $users = DB::query( |
| 4861 | 4861 | 'SELECT id, public_key |
| 4862 | - FROM ' . prefixTable('users') . ' |
|
| 4863 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 4862 | + FROM ' . prefixTable('users').' |
|
| 4863 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 4864 | 4864 | AND public_key != ""' |
| 4865 | 4865 | ); |
| 4866 | 4866 | foreach ($users as $user) { |
@@ -4897,7 +4897,7 @@ discard block |
||
| 4897 | 4897 | $_SESSION['user_id'], |
| 4898 | 4898 | 'at_modification', |
| 4899 | 4899 | $_SESSION['login'], |
| 4900 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 4900 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 4901 | 4901 | ); |
| 4902 | 4902 | |
| 4903 | 4903 | $returnValues = array( |
@@ -4907,7 +4907,7 @@ discard block |
||
| 4907 | 4907 | 'to_folder' => $inputData['folderId'], |
| 4908 | 4908 | ); |
| 4909 | 4909 | echo (string) prepareExchangedData( |
| 4910 | - $SETTINGS['cpassman_dir'],$returnValues, 'encode'); |
|
| 4910 | + $SETTINGS['cpassman_dir'], $returnValues, 'encode'); |
|
| 4911 | 4911 | break; |
| 4912 | 4912 | |
| 4913 | 4913 | /* |
@@ -4954,8 +4954,8 @@ discard block |
||
| 4954 | 4954 | // get data about item |
| 4955 | 4955 | $dataSource = DB::queryfirstrow( |
| 4956 | 4956 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 4957 | - FROM ' . prefixTable('items') . ' as i |
|
| 4958 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 4957 | + FROM ' . prefixTable('items').' as i |
|
| 4958 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 4959 | 4959 | WHERE i.id=%i', |
| 4960 | 4960 | $item_id |
| 4961 | 4961 | ); |
@@ -4978,7 +4978,7 @@ discard block |
||
| 4978 | 4978 | |
| 4979 | 4979 | // get data about new folder |
| 4980 | 4980 | $dataDestination = DB::queryfirstrow( |
| 4981 | - 'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 4981 | + 'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 4982 | 4982 | $inputData['folderId'] |
| 4983 | 4983 | ); |
| 4984 | 4984 | |
@@ -5019,7 +5019,7 @@ discard block |
||
| 5019 | 5019 | // Get fields for this Item |
| 5020 | 5020 | $rows = DB::query( |
| 5021 | 5021 | 'SELECT id |
| 5022 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5022 | + FROM ' . prefixTable('categories_items').' |
|
| 5023 | 5023 | WHERE item_id = %i', |
| 5024 | 5024 | $item_id |
| 5025 | 5025 | ); |
@@ -5036,7 +5036,7 @@ discard block |
||
| 5036 | 5036 | // Get FILES for this Item |
| 5037 | 5037 | $rows = DB::query( |
| 5038 | 5038 | 'SELECT id |
| 5039 | - FROM ' . prefixTable('files') . ' |
|
| 5039 | + FROM ' . prefixTable('files').' |
|
| 5040 | 5040 | WHERE id_item = %i', |
| 5041 | 5041 | $item_id |
| 5042 | 5042 | ); |
@@ -5089,7 +5089,7 @@ discard block |
||
| 5089 | 5089 | // Get the ITEM object key for the user |
| 5090 | 5090 | $userKey = DB::queryFirstRow( |
| 5091 | 5091 | 'SELECT share_key |
| 5092 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5092 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5093 | 5093 | WHERE user_id = %i AND object_id = %i', |
| 5094 | 5094 | $_SESSION['user_id'], |
| 5095 | 5095 | $item_id |
@@ -5100,8 +5100,8 @@ discard block |
||
| 5100 | 5100 | // This is a public object |
| 5101 | 5101 | $users = DB::query( |
| 5102 | 5102 | 'SELECT id, public_key |
| 5103 | - FROM ' . prefixTable('users') . ' |
|
| 5104 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 5103 | + FROM ' . prefixTable('users').' |
|
| 5104 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 5105 | 5105 | AND public_key != ""' |
| 5106 | 5106 | ); |
| 5107 | 5107 | foreach ($users as $user) { |
@@ -5121,14 +5121,14 @@ discard block |
||
| 5121 | 5121 | // Get fields for this Item |
| 5122 | 5122 | $rows = DB::query( |
| 5123 | 5123 | 'SELECT id |
| 5124 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5124 | + FROM ' . prefixTable('categories_items').' |
|
| 5125 | 5125 | WHERE item_id = %i', |
| 5126 | 5126 | $item_id |
| 5127 | 5127 | ); |
| 5128 | 5128 | foreach ($rows as $field) { |
| 5129 | 5129 | $userKey = DB::queryFirstRow( |
| 5130 | 5130 | 'SELECT share_key |
| 5131 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5131 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5132 | 5132 | WHERE user_id = %i AND object_id = %i', |
| 5133 | 5133 | $_SESSION['user_id'], |
| 5134 | 5134 | $field['id'] |
@@ -5139,8 +5139,8 @@ discard block |
||
| 5139 | 5139 | // This is a public object |
| 5140 | 5140 | $users = DB::query( |
| 5141 | 5141 | 'SELECT id, public_key |
| 5142 | - FROM ' . prefixTable('users') . ' |
|
| 5143 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 5142 | + FROM ' . prefixTable('users').' |
|
| 5143 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 5144 | 5144 | AND public_key != ""' |
| 5145 | 5145 | ); |
| 5146 | 5146 | foreach ($users as $user) { |
@@ -5161,14 +5161,14 @@ discard block |
||
| 5161 | 5161 | // Get FILES for this Item |
| 5162 | 5162 | $rows = DB::query( |
| 5163 | 5163 | 'SELECT id |
| 5164 | - FROM ' . prefixTable('files') . ' |
|
| 5164 | + FROM ' . prefixTable('files').' |
|
| 5165 | 5165 | WHERE id_item = %i', |
| 5166 | 5166 | $item_id |
| 5167 | 5167 | ); |
| 5168 | 5168 | foreach ($rows as $attachment) { |
| 5169 | 5169 | $userKey = DB::queryFirstRow( |
| 5170 | 5170 | 'SELECT share_key |
| 5171 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5171 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5172 | 5172 | WHERE user_id = %i AND object_id = %i', |
| 5173 | 5173 | $_SESSION['user_id'], |
| 5174 | 5174 | $attachment['id'] |
@@ -5179,8 +5179,8 @@ discard block |
||
| 5179 | 5179 | // This is a public object |
| 5180 | 5180 | $users = DB::query( |
| 5181 | 5181 | 'SELECT id, public_key |
| 5182 | - FROM ' . prefixTable('users') . ' |
|
| 5183 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 5182 | + FROM ' . prefixTable('users').' |
|
| 5183 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 5184 | 5184 | AND public_key != ""' |
| 5185 | 5185 | ); |
| 5186 | 5186 | foreach ($users as $user) { |
@@ -5216,13 +5216,13 @@ discard block |
||
| 5216 | 5216 | $_SESSION['user_id'], |
| 5217 | 5217 | 'at_modification', |
| 5218 | 5218 | $_SESSION['login'], |
| 5219 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5219 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5220 | 5220 | ); |
| 5221 | 5221 | } |
| 5222 | 5222 | } |
| 5223 | 5223 | |
| 5224 | 5224 | // reload cache table |
| 5225 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 5225 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 5226 | 5226 | updateCacheTable('reload', $SETTINGS, null); |
| 5227 | 5227 | |
| 5228 | 5228 | echo (string) prepareExchangedData( |
@@ -5291,7 +5291,7 @@ discard block |
||
| 5291 | 5291 | // get info |
| 5292 | 5292 | $dataSource = DB::queryfirstrow( |
| 5293 | 5293 | 'SELECT label, id_tree |
| 5294 | - FROM ' . prefixTable('items') . ' |
|
| 5294 | + FROM ' . prefixTable('items').' |
|
| 5295 | 5295 | WHERE id=%i', |
| 5296 | 5296 | $item_id |
| 5297 | 5297 | ); |
@@ -5396,8 +5396,8 @@ discard block |
||
| 5396 | 5396 | } |
| 5397 | 5397 | if ($inputData['cat'] === 'request_access_to_author') { |
| 5398 | 5398 | // Variables |
| 5399 | - $dataAuthor = DB::queryfirstrow('SELECT email,login FROM ' . prefixTable('users') . ' WHERE id = ' . $post_content[1]); |
|
| 5400 | - $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM ' . prefixTable('items') . ' WHERE id = ' . $post_content[0]); |
|
| 5399 | + $dataAuthor = DB::queryfirstrow('SELECT email,login FROM '.prefixTable('users').' WHERE id = '.$post_content[1]); |
|
| 5400 | + $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM '.prefixTable('items').' WHERE id = '.$post_content[0]); |
|
| 5401 | 5401 | |
| 5402 | 5402 | // Get path |
| 5403 | 5403 | $path = geItemReadablePath( |
@@ -5411,7 +5411,7 @@ discard block |
||
| 5411 | 5411 | langHdl('email_request_access_subject'), |
| 5412 | 5412 | str_replace( |
| 5413 | 5413 | array('#tp_item_author#', '#tp_user#', '#tp_item#'), |
| 5414 | - array(' ' . addslashes($dataAuthor['login']), addslashes($_SESSION['login']), $path), |
|
| 5414 | + array(' '.addslashes($dataAuthor['login']), addslashes($_SESSION['login']), $path), |
|
| 5415 | 5415 | langHdl('email_request_access_mail') |
| 5416 | 5416 | ), |
| 5417 | 5417 | $dataAuthor['email'], |
@@ -5422,7 +5422,7 @@ discard block |
||
| 5422 | 5422 | } elseif ($inputData['cat'] === 'share_this_item') { |
| 5423 | 5423 | $dataItem = DB::queryfirstrow( |
| 5424 | 5424 | 'SELECT label,id_tree |
| 5425 | - FROM ' . prefixTable('items') . ' |
|
| 5425 | + FROM ' . prefixTable('items').' |
|
| 5426 | 5426 | WHERE id= %i', |
| 5427 | 5427 | $inputData['id'] |
| 5428 | 5428 | ); |
@@ -5446,7 +5446,7 @@ discard block |
||
| 5446 | 5446 | ), |
| 5447 | 5447 | array( |
| 5448 | 5448 | empty($SETTINGS['email_server_url']) === false ? |
| 5449 | - $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $inputData['id'] : $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $inputData['id'], |
|
| 5449 | + $SETTINGS['email_server_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$inputData['id'] : $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$inputData['id'], |
|
| 5450 | 5450 | addslashes($_SESSION['login']), |
| 5451 | 5451 | addslashes($path), |
| 5452 | 5452 | ), |
@@ -5482,7 +5482,7 @@ discard block |
||
| 5482 | 5482 | if ($inputData['notifyType'] === 'on_show') { |
| 5483 | 5483 | // Check if values already exist |
| 5484 | 5484 | $data = DB::queryfirstrow( |
| 5485 | - 'SELECT notification FROM ' . prefixTable('items') . ' WHERE id = %i', |
|
| 5485 | + 'SELECT notification FROM '.prefixTable('items').' WHERE id = %i', |
|
| 5486 | 5486 | $inputData['itemId'] |
| 5487 | 5487 | ); |
| 5488 | 5488 | $notifiedUsers = explode(';', $data['notification']); |
@@ -5493,8 +5493,8 @@ discard block |
||
| 5493 | 5493 | prefixTable('items'), |
| 5494 | 5494 | array( |
| 5495 | 5495 | 'notification' => empty($data['notification']) ? |
| 5496 | - $inputData['userId'] . ';' |
|
| 5497 | - : $data['notification'] . $inputData['userId'] , |
|
| 5496 | + $inputData['userId'].';' |
|
| 5497 | + : $data['notification'].$inputData['userId'], |
|
| 5498 | 5498 | ), |
| 5499 | 5499 | 'id=%i', |
| 5500 | 5500 | $inputData['itemId'] |
@@ -5510,7 +5510,7 @@ discard block |
||
| 5510 | 5510 | array( |
| 5511 | 5511 | 'notification' => empty($data['notification']) ? |
| 5512 | 5512 | $inputData['userId'] |
| 5513 | - : $data['notification'] . ';' . $inputData['userId'], |
|
| 5513 | + : $data['notification'].';'.$inputData['userId'], |
|
| 5514 | 5514 | ), |
| 5515 | 5515 | 'id=%i', |
| 5516 | 5516 | $inputData['itemId'] |
@@ -5543,8 +5543,8 @@ discard block |
||
| 5543 | 5543 | // Get all informations for this item |
| 5544 | 5544 | $dataItem = DB::queryfirstrow( |
| 5545 | 5545 | 'SELECT * |
| 5546 | - FROM ' . prefixTable('items') . ' as i |
|
| 5547 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 5546 | + FROM ' . prefixTable('items').' as i |
|
| 5547 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 5548 | 5548 | WHERE i.id=%i AND l.action = %s', |
| 5549 | 5549 | $dataReceived['item_id'], |
| 5550 | 5550 | 'at_creation' |
@@ -5575,14 +5575,14 @@ discard block |
||
| 5575 | 5575 | ); |
| 5576 | 5576 | // Prepare new line |
| 5577 | 5577 | $data = DB::queryfirstrow( |
| 5578 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC', |
|
| 5578 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC', |
|
| 5579 | 5579 | $dataReceived['item_id'] |
| 5580 | 5580 | ); |
| 5581 | - $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $data['date']) . ' - ' . $_SESSION['login'] . ' - ' . langHdl($data['action']) . ' - ' . $data['raison']; |
|
| 5581 | + $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $data['date']).' - '.$_SESSION['login'].' - '.langHdl($data['action']).' - '.$data['raison']; |
|
| 5582 | 5582 | // send back |
| 5583 | 5583 | $data = array( |
| 5584 | 5584 | 'error' => '', |
| 5585 | - 'new_line' => '<br>' . addslashes($historic), |
|
| 5585 | + 'new_line' => '<br>'.addslashes($historic), |
|
| 5586 | 5586 | ); |
| 5587 | 5587 | echo (string) prepareExchangedData( |
| 5588 | 5588 | $SETTINGS['cpassman_dir'], |
@@ -5650,7 +5650,7 @@ discard block |
||
| 5650 | 5650 | } |
| 5651 | 5651 | |
| 5652 | 5652 | // delete all existing old otv codes |
| 5653 | - $rows = DB::query('SELECT id FROM ' . prefixTable('otv') . ' WHERE timestamp < ' . (time() - $SETTINGS['otv_expiration_period'] * 86400)); |
|
| 5653 | + $rows = DB::query('SELECT id FROM '.prefixTable('otv').' WHERE timestamp < '.(time() - $SETTINGS['otv_expiration_period'] * 86400)); |
|
| 5654 | 5654 | foreach ($rows as $record) { |
| 5655 | 5655 | DB::delete(prefixTable('otv'), 'id=%i', $record['id']); |
| 5656 | 5656 | } |
@@ -5672,8 +5672,8 @@ discard block |
||
| 5672 | 5672 | // Should we log a password change? |
| 5673 | 5673 | $itemQ = DB::queryFirstRow( |
| 5674 | 5674 | 'SELECT s.share_key, i.pw |
| 5675 | - FROM ' . prefixTable('items') . ' AS i |
|
| 5676 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id) |
|
| 5675 | + FROM ' . prefixTable('items').' AS i |
|
| 5676 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id) |
|
| 5677 | 5677 | WHERE s.user_id = %i AND s.object_id = %i', |
| 5678 | 5678 | $_SESSION['user_id'], |
| 5679 | 5679 | $inputData['id'] |
@@ -5723,7 +5723,7 @@ discard block |
||
| 5723 | 5723 | if (isset($SETTINGS['otv_expiration_period']) === false) { |
| 5724 | 5724 | $SETTINGS['otv_expiration_period'] = 7; |
| 5725 | 5725 | } |
| 5726 | - $url = $SETTINGS['cpassman_url'] . '/index.php?otv=true&' . http_build_query($otv_session); |
|
| 5726 | + $url = $SETTINGS['cpassman_url'].'/index.php?otv=true&'.http_build_query($otv_session); |
|
| 5727 | 5727 | //$exp_date = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], time() + (intval($SETTINGS['otv_expiration_period']) * 86400)); |
| 5728 | 5728 | |
| 5729 | 5729 | echo json_encode( |
@@ -5762,8 +5762,8 @@ discard block |
||
| 5762 | 5762 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, |
| 5763 | 5763 | f.extension AS extension, f.type AS type, |
| 5764 | 5764 | s.share_key AS share_key |
| 5765 | - FROM ' . prefixTable('files') . ' AS f |
|
| 5766 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 5765 | + FROM ' . prefixTable('files').' AS f |
|
| 5766 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 5767 | 5767 | WHERE s.user_id = %i AND s.object_id = %i', |
| 5768 | 5768 | $_SESSION['user_id'], |
| 5769 | 5769 | $inputData['id'] |
@@ -5785,7 +5785,7 @@ discard block |
||
| 5785 | 5785 | //$fileName = basename($file_info['name'], '.'.$file_info['extension']); |
| 5786 | 5786 | |
| 5787 | 5787 | // prepare image info |
| 5788 | - $post_title = basename($file_info['name'], '.' . $file_info['extension']); |
|
| 5788 | + $post_title = basename($file_info['name'], '.'.$file_info['extension']); |
|
| 5789 | 5789 | $post_title = isBase64($post_title) === true ? |
| 5790 | 5790 | base64_decode($post_title) : $post_title; |
| 5791 | 5791 | $image_code = $file_info['file']; |
@@ -5803,7 +5803,7 @@ discard block |
||
| 5803 | 5803 | $SETTINGS['cpassman_dir'], |
| 5804 | 5804 | array( |
| 5805 | 5805 | 'error' => false, |
| 5806 | - 'filename' => $post_title . '.' . $file_info['extension'], |
|
| 5806 | + 'filename' => $post_title.'.'.$file_info['extension'], |
|
| 5807 | 5807 | 'file_type' => $file_info['type'], |
| 5808 | 5808 | 'file_content' => $fileContent, |
| 5809 | 5809 | ), |
@@ -5857,16 +5857,16 @@ discard block |
||
| 5857 | 5857 | $idFolder = $dataReceived['idFolder']; |
| 5858 | 5858 | |
| 5859 | 5859 | // don't check if Personal Folder |
| 5860 | - $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $idFolder); |
|
| 5860 | + $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $idFolder); |
|
| 5861 | 5861 | if ($data['title'] === $_SESSION['user_id']) { |
| 5862 | 5862 | // send data |
| 5863 | - echo '[{"duplicate" : "' . $duplicate . '" , error" : ""}]'; |
|
| 5863 | + echo '[{"duplicate" : "'.$duplicate.'" , error" : ""}]'; |
|
| 5864 | 5864 | } else { |
| 5865 | 5865 | if ($inputData['option'] === 'same_folder') { |
| 5866 | 5866 | // case unique folder |
| 5867 | 5867 | DB::query( |
| 5868 | 5868 | 'SELECT label |
| 5869 | - FROM ' . prefixTable('items') . ' |
|
| 5869 | + FROM ' . prefixTable('items').' |
|
| 5870 | 5870 | WHERE id_tree = %i AND label = %s', |
| 5871 | 5871 | $idFolder, |
| 5872 | 5872 | $label |
@@ -5878,7 +5878,7 @@ discard block |
||
| 5878 | 5878 | $arrayPf = array(); |
| 5879 | 5879 | if (empty($row['id']) === false) { |
| 5880 | 5880 | $rows = DB::query( |
| 5881 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 5881 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 5882 | 5882 | '1' |
| 5883 | 5883 | ); |
| 5884 | 5884 | foreach ($rows as $record) { |
@@ -5893,12 +5893,12 @@ discard block |
||
| 5893 | 5893 | $where->add('id_tree = %i', $idFolder); |
| 5894 | 5894 | $where->add('label = %s', $label); |
| 5895 | 5895 | if (empty($arrayPf) === false) { |
| 5896 | - $where->add('id_tree NOT IN (' . implode(',', $arrayPf) . ')'); |
|
| 5896 | + $where->add('id_tree NOT IN ('.implode(',', $arrayPf).')'); |
|
| 5897 | 5897 | } |
| 5898 | 5898 | |
| 5899 | 5899 | DB::query( |
| 5900 | 5900 | 'SELECT label |
| 5901 | - FROM ' . prefixTable('items') . ' |
|
| 5901 | + FROM ' . prefixTable('items').' |
|
| 5902 | 5902 | WHERE %l', |
| 5903 | 5903 | $where |
| 5904 | 5904 | ); |
@@ -5910,7 +5910,7 @@ discard block |
||
| 5910 | 5910 | } |
| 5911 | 5911 | |
| 5912 | 5912 | // send data |
| 5913 | - echo '[{"duplicate" : "' . $duplicate . '" , "error" : ""}]'; |
|
| 5913 | + echo '[{"duplicate" : "'.$duplicate.'" , "error" : ""}]'; |
|
| 5914 | 5914 | } |
| 5915 | 5915 | break; |
| 5916 | 5916 | |
@@ -5946,7 +5946,7 @@ discard block |
||
| 5946 | 5946 | // do we have a cache to be used? |
| 5947 | 5947 | $goCachedFolders = loadFoldersListByCache('visible_folders', 'folders'); |
| 5948 | 5948 | if ($goCachedFolders['state'] === true) { |
| 5949 | - $arr_data['folders'] = json_decode($goCachedFolders['data'], true);//print_r($arr_data); |
|
| 5949 | + $arr_data['folders'] = json_decode($goCachedFolders['data'], true); //print_r($arr_data); |
|
| 5950 | 5950 | // send data |
| 5951 | 5951 | echo (string) prepareExchangedData( |
| 5952 | 5952 | $SETTINGS['cpassman_dir'], |
@@ -5982,7 +5982,7 @@ discard block |
||
| 5982 | 5982 | } |
| 5983 | 5983 | |
| 5984 | 5984 | //Build tree |
| 5985 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tree/NestedTree/NestedTree.php'; |
|
| 5985 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tree/NestedTree/NestedTree.php'; |
|
| 5986 | 5986 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 5987 | 5987 | $tree->rebuild(); |
| 5988 | 5988 | $folders = $tree->getDescendants(); |
@@ -6032,7 +6032,7 @@ discard block |
||
| 6032 | 6032 | if (empty($arr_data['folders'][$inc]['path']) === true) { |
| 6033 | 6033 | $arr_data['folders'][$inc]['path'] = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
| 6034 | 6034 | } else { |
| 6035 | - $arr_data['folders'][$inc]['path'] .= ' / ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6035 | + $arr_data['folders'][$inc]['path'] .= ' / '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6036 | 6036 | } |
| 6037 | 6037 | } |
| 6038 | 6038 | |
@@ -6101,7 +6101,7 @@ discard block |
||
| 6101 | 6101 | $foldersArray = json_decode($inputData['data'], true); |
| 6102 | 6102 | $rows = DB::query( |
| 6103 | 6103 | 'SELECT id, categories |
| 6104 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 6104 | + FROM ' . prefixTable('nested_tree').' |
|
| 6105 | 6105 | WHERE id IN (%l)', |
| 6106 | 6106 | implode(',', $foldersArray) |
| 6107 | 6107 | ); |
@@ -6144,7 +6144,7 @@ discard block |
||
| 6144 | 6144 | // get item info |
| 6145 | 6145 | $dataItem = DB::queryFirstRow( |
| 6146 | 6146 | 'SELECT * |
| 6147 | - FROM ' . prefixTable('items') . ' |
|
| 6147 | + FROM ' . prefixTable('items').' |
|
| 6148 | 6148 | WHERE id=%i', |
| 6149 | 6149 | $inputData['itemId'] |
| 6150 | 6150 | ); |
@@ -6154,8 +6154,8 @@ discard block |
||
| 6154 | 6154 | $rows = DB::query( |
| 6155 | 6155 | 'SELECT l.date as date, l.action as action, l.raison as raison, |
| 6156 | 6156 | u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname |
| 6157 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 6158 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 6157 | + FROM ' . prefixTable('log_items').' as l |
|
| 6158 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 6159 | 6159 | WHERE id_item=%i AND l.action NOT IN (%l) |
| 6160 | 6160 | ORDER BY date DESC', |
| 6161 | 6161 | $inputData['itemId'], |
@@ -6170,18 +6170,18 @@ discard block |
||
| 6170 | 6170 | |
| 6171 | 6171 | // imported via API |
| 6172 | 6172 | if (empty($record['login'])) { |
| 6173 | - $record['login'] = langHdl('imported_via_api') . ' [' . $record['raison'] . ']'; |
|
| 6173 | + $record['login'] = langHdl('imported_via_api').' ['.$record['raison'].']'; |
|
| 6174 | 6174 | } |
| 6175 | 6175 | |
| 6176 | 6176 | // Prepare avatar |
| 6177 | 6177 | if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) { |
| 6178 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) { |
|
| 6179 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb']; |
|
| 6178 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) { |
|
| 6179 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb']; |
|
| 6180 | 6180 | } else { |
| 6181 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6181 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6182 | 6182 | } |
| 6183 | 6183 | } else { |
| 6184 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6184 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6185 | 6185 | } |
| 6186 | 6186 | |
| 6187 | 6187 | // Prepare action |
@@ -6198,19 +6198,19 @@ discard block |
||
| 6198 | 6198 | $action = langHdl($reason[0]); |
| 6199 | 6199 | if ($reason[0] === 'at_moved') { |
| 6200 | 6200 | $tmp = explode(' -> ', $reason[1]); |
| 6201 | - $detail = langHdl('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . langHdl('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>'; |
|
| 6201 | + $detail = langHdl('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.langHdl('to').' <span class="font-weight-light">'.$tmp[1].' </span>'; |
|
| 6202 | 6202 | } elseif ($reason[0] === 'at_field') { |
| 6203 | 6203 | $tmp = explode(' => ', $reason[1]); |
| 6204 | 6204 | if (count($tmp) > 1) { |
| 6205 | - $detail = '<b>' . trim($tmp[0]) . '</b> | ' . langHdl('previous_value') . |
|
| 6206 | - ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>'; |
|
| 6205 | + $detail = '<b>'.trim($tmp[0]).'</b> | '.langHdl('previous_value'). |
|
| 6206 | + ': <span class="font-weight-light">'.trim($tmp[1]).'</span>'; |
|
| 6207 | 6207 | } else { |
| 6208 | 6208 | $detail = trim($reason[1]); |
| 6209 | 6209 | } |
| 6210 | 6210 | } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) { |
| 6211 | 6211 | $tmp = explode(' => ', $reason[1]); |
| 6212 | 6212 | $detail = empty(trim($tmp[0])) === true ? |
| 6213 | - langHdl('no_previous_value') : langHdl('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>'; |
|
| 6213 | + langHdl('no_previous_value') : langHdl('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>'; |
|
| 6214 | 6214 | } elseif ($reason[0] === 'at_automatic_del') { |
| 6215 | 6215 | $detail = langHdl($reason[1]); |
| 6216 | 6216 | } elseif ($reason[0] === 'at_anyoneconmodify') { |
@@ -6219,7 +6219,7 @@ discard block |
||
| 6219 | 6219 | $tmp = explode(':', $reason[1]); |
| 6220 | 6220 | $tmp = explode('.', $tmp[0]); |
| 6221 | 6221 | $detail = isBase64($tmp[0]) === true ? |
| 6222 | - base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0]; |
|
| 6222 | + base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0]; |
|
| 6223 | 6223 | } elseif ($reason[0] === 'at_import') { |
| 6224 | 6224 | $detail = ''; |
| 6225 | 6225 | } elseif (in_array($reason[0], array('csv', 'pdf')) === true) { |
@@ -6238,8 +6238,8 @@ discard block |
||
| 6238 | 6238 | array( |
| 6239 | 6239 | 'avatar' => $avatar, |
| 6240 | 6240 | 'login' => $record['login'], |
| 6241 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
| 6242 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6241 | + 'name' => $record['name'].' '.$record['lastname'], |
|
| 6242 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6243 | 6243 | 'action' => $action, |
| 6244 | 6244 | 'detail' => $detail, |
| 6245 | 6245 | ) |
@@ -6326,18 +6326,18 @@ discard block |
||
| 6326 | 6326 | |
| 6327 | 6327 | // get some info to add to the notification email |
| 6328 | 6328 | $resp_user = DB::queryfirstrow( |
| 6329 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
| 6329 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
| 6330 | 6330 | $_SESSION['user_id'] |
| 6331 | 6331 | ); |
| 6332 | 6332 | $resp_folder = DB::queryfirstrow( |
| 6333 | - 'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 6333 | + 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 6334 | 6334 | $folder |
| 6335 | 6335 | ); |
| 6336 | 6336 | |
| 6337 | 6337 | // notify Managers |
| 6338 | 6338 | $rows = DB::query( |
| 6339 | 6339 | 'SELECT email |
| 6340 | - FROM ' . prefixTable('users') . ' |
|
| 6340 | + FROM ' . prefixTable('users').' |
|
| 6341 | 6341 | WHERE `gestionnaire` = %i AND `email` IS NOT NULL', |
| 6342 | 6342 | 1 |
| 6343 | 6343 | ); |
@@ -6369,14 +6369,14 @@ discard block |
||
| 6369 | 6369 | // Get list of users |
| 6370 | 6370 | $usersList = array(); |
| 6371 | 6371 | $usersString = ''; |
| 6372 | - $rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC'); |
|
| 6372 | + $rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC'); |
|
| 6373 | 6373 | foreach ($rows as $record) { |
| 6374 | 6374 | $usersList[$record['login']] = array( |
| 6375 | 6375 | 'id' => $record['id'], |
| 6376 | 6376 | 'login' => $record['login'], |
| 6377 | 6377 | 'email' => $record['email'], |
| 6378 | 6378 | ); |
| 6379 | - $usersString .= $record['id'] . '#' . $record['login'] . ';'; |
|
| 6379 | + $usersString .= $record['id'].'#'.$record['login'].';'; |
|
| 6380 | 6380 | } |
| 6381 | 6381 | |
| 6382 | 6382 | $data = array( |
@@ -6386,7 +6386,7 @@ discard block |
||
| 6386 | 6386 | |
| 6387 | 6387 | // send data |
| 6388 | 6388 | echo (string) prepareExchangedData( |
| 6389 | - $SETTINGS['cpassman_dir'],$data, 'encode'); |
|
| 6389 | + $SETTINGS['cpassman_dir'], $data, 'encode'); |
|
| 6390 | 6390 | break; |
| 6391 | 6391 | |
| 6392 | 6392 | case 'send_request_access': |
@@ -6404,7 +6404,7 @@ discard block |
||
| 6404 | 6404 | } |
| 6405 | 6405 | // decrypt and retrieve data in JSON format |
| 6406 | 6406 | $dataReceived = prepareExchangedData( |
| 6407 | - $SETTINGS['cpassman_dir'],$inputData['data'], 'decode'); |
|
| 6407 | + $SETTINGS['cpassman_dir'], $inputData['data'], 'decode'); |
|
| 6408 | 6408 | |
| 6409 | 6409 | // prepare variables |
| 6410 | 6410 | //$post_email_body = filter_var($dataReceived['email'], FILTER_SANITIZE_STRING); |
@@ -6413,7 +6413,7 @@ discard block |
||
| 6413 | 6413 | // Send email |
| 6414 | 6414 | $dataItem = DB::queryfirstrow( |
| 6415 | 6415 | 'SELECT label, id_tree |
| 6416 | - FROM ' . prefixTable('items') . ' |
|
| 6416 | + FROM ' . prefixTable('items').' |
|
| 6417 | 6417 | WHERE id = %i', |
| 6418 | 6418 | $inputData['itemId'] |
| 6419 | 6419 | ); |
@@ -6502,7 +6502,7 @@ discard block |
||
| 6502 | 6502 | } |
| 6503 | 6503 | // decrypt and retrieve data in JSON format |
| 6504 | 6504 | $dataReceived = prepareExchangedData( |
| 6505 | - $SETTINGS['cpassman_dir'],$inputData['data'], 'decode'); |
|
| 6505 | + $SETTINGS['cpassman_dir'], $inputData['data'], 'decode'); |
|
| 6506 | 6506 | |
| 6507 | 6507 | // prepare variables |
| 6508 | 6508 | $post_notification_status = (int) filter_var($dataReceived['notification_status'], FILTER_SANITIZE_NUMBER_INT); |
@@ -6510,7 +6510,7 @@ discard block |
||
| 6510 | 6510 | |
| 6511 | 6511 | DB::query( |
| 6512 | 6512 | 'SELECT * |
| 6513 | - FROM ' . prefixTable('notification') . ' |
|
| 6513 | + FROM ' . prefixTable('notification').' |
|
| 6514 | 6514 | WHERE item_id = %i AND user_id = %i', |
| 6515 | 6515 | $inputData['itemId'], |
| 6516 | 6516 | $_SESSION['user_id'] |
@@ -6547,7 +6547,7 @@ discard block |
||
| 6547 | 6547 | |
| 6548 | 6548 | // send data |
| 6549 | 6549 | echo (string) prepareExchangedData( |
| 6550 | - $SETTINGS['cpassman_dir'],$data, 'encode'); |
|
| 6550 | + $SETTINGS['cpassman_dir'], $data, 'encode'); |
|
| 6551 | 6551 | |
| 6552 | 6552 | break; |
| 6553 | 6553 | |
@@ -6570,7 +6570,7 @@ discard block |
||
| 6570 | 6570 | } |
| 6571 | 6571 | // decrypt and retrieve data in JSON format |
| 6572 | 6572 | $dataReceived = prepareExchangedData( |
| 6573 | - $SETTINGS['cpassman_dir'],$inputData['data'], 'decode'); |
|
| 6573 | + $SETTINGS['cpassman_dir'], $inputData['data'], 'decode'); |
|
| 6574 | 6574 | |
| 6575 | 6575 | // prepare variables |
| 6576 | 6576 | $inputData['itemId'] = (int) filter_var($dataReceived['item_id'], FILTER_SANITIZE_NUMBER_INT); |
@@ -6579,7 +6579,7 @@ discard block |
||
| 6579 | 6579 | // And related logs |
| 6580 | 6580 | $rows = DB::query( |
| 6581 | 6581 | 'SELECT id, file AS filename |
| 6582 | - FROM ' . prefixTable('files') . ' |
|
| 6582 | + FROM ' . prefixTable('files').' |
|
| 6583 | 6583 | WHERE id_item = %i AND confirmed = %i', |
| 6584 | 6584 | $inputData['itemId'], |
| 6585 | 6585 | 0 |
@@ -6593,12 +6593,12 @@ discard block |
||
| 6593 | 6593 | ); |
| 6594 | 6594 | |
| 6595 | 6595 | // Delete file on server |
| 6596 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename'])); |
|
| 6596 | + unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename'])); |
|
| 6597 | 6597 | |
| 6598 | 6598 | // Delete related logs |
| 6599 | 6599 | $logFile = DB::query( |
| 6600 | 6600 | 'SELECT increment_id, raison |
| 6601 | - FROM ' . prefixTable('log_items') . ' |
|
| 6601 | + FROM ' . prefixTable('log_items').' |
|
| 6602 | 6602 | WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"', |
| 6603 | 6603 | $inputData['itemId'], |
| 6604 | 6604 | $_SESSION['user_id'], |
@@ -6623,7 +6623,7 @@ discard block |
||
| 6623 | 6623 | |
| 6624 | 6624 | // send data |
| 6625 | 6625 | echo (string) prepareExchangedData( |
| 6626 | - $SETTINGS['cpassman_dir'],$data, 'encode'); |
|
| 6626 | + $SETTINGS['cpassman_dir'], $data, 'encode'); |
|
| 6627 | 6627 | |
| 6628 | 6628 | break; |
| 6629 | 6629 | |
@@ -6657,7 +6657,7 @@ discard block |
||
| 6657 | 6657 | // Confirm attachments |
| 6658 | 6658 | $rows = DB::query( |
| 6659 | 6659 | 'SELECT id, file AS filename |
| 6660 | - FROM ' . prefixTable('files') . ' |
|
| 6660 | + FROM ' . prefixTable('files').' |
|
| 6661 | 6661 | WHERE id_item = %i AND confirmed = %i', |
| 6662 | 6662 | $inputData['itemId'], |
| 6663 | 6663 | 0 |
@@ -6680,7 +6680,7 @@ discard block |
||
| 6680 | 6680 | |
| 6681 | 6681 | // send data |
| 6682 | 6682 | echo (string) prepareExchangedData( |
| 6683 | - $SETTINGS['cpassman_dir'],$data, 'encode'); |
|
| 6683 | + $SETTINGS['cpassman_dir'], $data, 'encode'); |
|
| 6684 | 6684 | |
| 6685 | 6685 | break; |
| 6686 | 6686 | } |
@@ -6695,15 +6695,15 @@ discard block |
||
| 6695 | 6695 | case 'autocomplete_tags': |
| 6696 | 6696 | // Get a list off all existing TAGS |
| 6697 | 6697 | $listOfTags = ''; |
| 6698 | - $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 6698 | + $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 6699 | 6699 | foreach ($rows as $record) { |
| 6700 | 6700 | if (empty($listOfTags)) { |
| 6701 | - $listOfTags = '"' . $record['tag'] . '"'; |
|
| 6701 | + $listOfTags = '"'.$record['tag'].'"'; |
|
| 6702 | 6702 | } else { |
| 6703 | - $listOfTags .= ', "' . $record['tag'] . '"'; |
|
| 6703 | + $listOfTags .= ', "'.$record['tag'].'"'; |
|
| 6704 | 6704 | } |
| 6705 | 6705 | } |
| 6706 | - echo '[' . $listOfTags . ']'; |
|
| 6706 | + echo '['.$listOfTags.']'; |
|
| 6707 | 6707 | break; |
| 6708 | 6708 | } |
| 6709 | 6709 | } |
@@ -6719,7 +6719,7 @@ discard block |
||
| 6719 | 6719 | { |
| 6720 | 6720 | $data = DB::queryFirstRow( |
| 6721 | 6721 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 6722 | - FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 6722 | + FROM ' . prefixTable('nested_tree').' WHERE id = %i', |
|
| 6723 | 6723 | $groupe |
| 6724 | 6724 | ); |
| 6725 | 6725 | // Check if it's in a personal folder. If yes, then force complexity overhead. |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | |
| 35 | 35 | // Load config if $SETTINGS not defined |
| 36 | 36 | if (isset($SETTINGS['cpassman_dir']) === false || empty($SETTINGS['cpassman_dir']) === true) { |
| 37 | - include_once __DIR__ . '/../includes/config/tp.config.php'; |
|
| 37 | + include_once __DIR__.'/../includes/config/tp.config.php'; |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | header('Content-type: text/html; charset=utf-8'); |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | $session_language = $superGlobal->get(trim($string), 'SESSION', 'lang'); |
| 67 | 67 | if (isset($session_language) === false) { |
| 68 | 68 | // Manage error and get English version |
| 69 | - $language_array = include __DIR__. '/../includes/language/english.php'; |
|
| 69 | + $language_array = include __DIR__.'/../includes/language/english.php'; |
|
| 70 | 70 | print_r($session_language); |
| 71 | 71 | $session_language = $language_array[trim($string)]; |
| 72 | 72 | } |
@@ -117,29 +117,29 @@ discard block |
||
| 117 | 117 | */ |
| 118 | 118 | function cryption(string $message, string $ascii_key, string $type, array $SETTINGS): array |
| 119 | 119 | { |
| 120 | - $ascii_key = empty($ascii_key) === true ? file_get_contents(SECUREPATH . '/teampass-seckey.txt') : $ascii_key; |
|
| 120 | + $ascii_key = empty($ascii_key) === true ? file_get_contents(SECUREPATH.'/teampass-seckey.txt') : $ascii_key; |
|
| 121 | 121 | $err = false; |
| 122 | 122 | // load PhpEncryption library |
| 123 | 123 | if (isset($SETTINGS['cpassman_dir']) === false || empty($SETTINGS['cpassman_dir']) === true) { |
| 124 | 124 | $path = '../includes/libraries/Encryption/Encryption/'; |
| 125 | 125 | } else { |
| 126 | - $path = $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/'; |
|
| 127 | - } |
|
| 128 | - |
|
| 129 | - include_once $path . 'Exception/CryptoException.php'; |
|
| 130 | - include_once $path . 'Exception/BadFormatException.php'; |
|
| 131 | - include_once $path . 'Exception/EnvironmentIsBrokenException.php'; |
|
| 132 | - include_once $path . 'Exception/IOException.php'; |
|
| 133 | - include_once $path . 'Exception/WrongKeyOrModifiedCiphertextException.php'; |
|
| 134 | - include_once $path . 'Crypto.php'; |
|
| 135 | - include_once $path . 'Encoding.php'; |
|
| 136 | - include_once $path . 'DerivedKeys.php'; |
|
| 137 | - include_once $path . 'Key.php'; |
|
| 138 | - include_once $path . 'KeyOrPassword.php'; |
|
| 139 | - include_once $path . 'File.php'; |
|
| 140 | - include_once $path . 'RuntimeTests.php'; |
|
| 141 | - include_once $path . 'KeyProtectedByPassword.php'; |
|
| 142 | - include_once $path . 'Core.php'; |
|
| 126 | + $path = $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/'; |
|
| 127 | + } |
|
| 128 | + |
|
| 129 | + include_once $path.'Exception/CryptoException.php'; |
|
| 130 | + include_once $path.'Exception/BadFormatException.php'; |
|
| 131 | + include_once $path.'Exception/EnvironmentIsBrokenException.php'; |
|
| 132 | + include_once $path.'Exception/IOException.php'; |
|
| 133 | + include_once $path.'Exception/WrongKeyOrModifiedCiphertextException.php'; |
|
| 134 | + include_once $path.'Crypto.php'; |
|
| 135 | + include_once $path.'Encoding.php'; |
|
| 136 | + include_once $path.'DerivedKeys.php'; |
|
| 137 | + include_once $path.'Key.php'; |
|
| 138 | + include_once $path.'KeyOrPassword.php'; |
|
| 139 | + include_once $path.'File.php'; |
|
| 140 | + include_once $path.'RuntimeTests.php'; |
|
| 141 | + include_once $path.'KeyProtectedByPassword.php'; |
|
| 142 | + include_once $path.'Core.php'; |
|
| 143 | 143 | |
| 144 | 144 | // convert KEY |
| 145 | 145 | $key = \Defuse\Crypto\Key::loadFromAsciiSafeString($ascii_key); |
@@ -184,20 +184,20 @@ discard block |
||
| 184 | 184 | $path = '../includes/libraries/Encryption/Encryption/'; |
| 185 | 185 | } |
| 186 | 186 | |
| 187 | - include_once $path . 'Exception/CryptoException.php'; |
|
| 188 | - include_once $path . 'Exception/BadFormatException.php'; |
|
| 189 | - include_once $path . 'Exception/EnvironmentIsBrokenException.php'; |
|
| 190 | - include_once $path . 'Exception/IOException.php'; |
|
| 191 | - include_once $path . 'Exception/WrongKeyOrModifiedCiphertextException.php'; |
|
| 192 | - include_once $path . 'Crypto.php'; |
|
| 193 | - include_once $path . 'Encoding.php'; |
|
| 194 | - include_once $path . 'DerivedKeys.php'; |
|
| 195 | - include_once $path . 'Key.php'; |
|
| 196 | - include_once $path . 'KeyOrPassword.php'; |
|
| 197 | - include_once $path . 'File.php'; |
|
| 198 | - include_once $path . 'RuntimeTests.php'; |
|
| 199 | - include_once $path . 'KeyProtectedByPassword.php'; |
|
| 200 | - include_once $path . 'Core.php'; |
|
| 187 | + include_once $path.'Exception/CryptoException.php'; |
|
| 188 | + include_once $path.'Exception/BadFormatException.php'; |
|
| 189 | + include_once $path.'Exception/EnvironmentIsBrokenException.php'; |
|
| 190 | + include_once $path.'Exception/IOException.php'; |
|
| 191 | + include_once $path.'Exception/WrongKeyOrModifiedCiphertextException.php'; |
|
| 192 | + include_once $path.'Crypto.php'; |
|
| 193 | + include_once $path.'Encoding.php'; |
|
| 194 | + include_once $path.'DerivedKeys.php'; |
|
| 195 | + include_once $path.'Key.php'; |
|
| 196 | + include_once $path.'KeyOrPassword.php'; |
|
| 197 | + include_once $path.'File.php'; |
|
| 198 | + include_once $path.'RuntimeTests.php'; |
|
| 199 | + include_once $path.'KeyProtectedByPassword.php'; |
|
| 200 | + include_once $path.'Core.php'; |
|
| 201 | 201 | |
| 202 | 202 | $key = \Defuse\Crypto\Key::createNewRandomKey(); |
| 203 | 203 | $key = $key->saveToAsciiSafeString(); |
@@ -222,20 +222,20 @@ discard block |
||
| 222 | 222 | $path = '../includes/libraries/Encryption/Encryption/'; |
| 223 | 223 | } |
| 224 | 224 | |
| 225 | - include_once $path . 'Exception/CryptoException.php'; |
|
| 226 | - include_once $path . 'Exception/BadFormatException.php'; |
|
| 227 | - include_once $path . 'Exception/EnvironmentIsBrokenException.php'; |
|
| 228 | - include_once $path . 'Exception/IOException.php'; |
|
| 229 | - include_once $path . 'Exception/WrongKeyOrModifiedCiphertextException.php'; |
|
| 230 | - include_once $path . 'Crypto.php'; |
|
| 231 | - include_once $path . 'Encoding.php'; |
|
| 232 | - include_once $path . 'DerivedKeys.php'; |
|
| 233 | - include_once $path . 'Key.php'; |
|
| 234 | - include_once $path . 'KeyOrPassword.php'; |
|
| 235 | - include_once $path . 'File.php'; |
|
| 236 | - include_once $path . 'RuntimeTests.php'; |
|
| 237 | - include_once $path . 'KeyProtectedByPassword.php'; |
|
| 238 | - include_once $path . 'Core.php'; |
|
| 225 | + include_once $path.'Exception/CryptoException.php'; |
|
| 226 | + include_once $path.'Exception/BadFormatException.php'; |
|
| 227 | + include_once $path.'Exception/EnvironmentIsBrokenException.php'; |
|
| 228 | + include_once $path.'Exception/IOException.php'; |
|
| 229 | + include_once $path.'Exception/WrongKeyOrModifiedCiphertextException.php'; |
|
| 230 | + include_once $path.'Crypto.php'; |
|
| 231 | + include_once $path.'Encoding.php'; |
|
| 232 | + include_once $path.'DerivedKeys.php'; |
|
| 233 | + include_once $path.'Key.php'; |
|
| 234 | + include_once $path.'KeyOrPassword.php'; |
|
| 235 | + include_once $path.'File.php'; |
|
| 236 | + include_once $path.'RuntimeTests.php'; |
|
| 237 | + include_once $path.'KeyProtectedByPassword.php'; |
|
| 238 | + include_once $path.'Core.php'; |
|
| 239 | 239 | |
| 240 | 240 | $protected_key = \Defuse\Crypto\KeyProtectedByPassword::createRandomPasswordProtectedKey($psk); |
| 241 | 241 | return $protected_key->saveToAsciiSafeString(); // save this in user table |
@@ -260,20 +260,20 @@ discard block |
||
| 260 | 260 | $path = '../includes/libraries/Encryption/Encryption/'; |
| 261 | 261 | } |
| 262 | 262 | |
| 263 | - include_once $path . 'Exception/CryptoException.php'; |
|
| 264 | - include_once $path . 'Exception/BadFormatException.php'; |
|
| 265 | - include_once $path . 'Exception/EnvironmentIsBrokenException.php'; |
|
| 266 | - include_once $path . 'Exception/IOException.php'; |
|
| 267 | - include_once $path . 'Exception/WrongKeyOrModifiedCiphertextException.php'; |
|
| 268 | - include_once $path . 'Crypto.php'; |
|
| 269 | - include_once $path . 'Encoding.php'; |
|
| 270 | - include_once $path . 'DerivedKeys.php'; |
|
| 271 | - include_once $path . 'Key.php'; |
|
| 272 | - include_once $path . 'KeyOrPassword.php'; |
|
| 273 | - include_once $path . 'File.php'; |
|
| 274 | - include_once $path . 'RuntimeTests.php'; |
|
| 275 | - include_once $path . 'KeyProtectedByPassword.php'; |
|
| 276 | - include_once $path . 'Core.php'; |
|
| 263 | + include_once $path.'Exception/CryptoException.php'; |
|
| 264 | + include_once $path.'Exception/BadFormatException.php'; |
|
| 265 | + include_once $path.'Exception/EnvironmentIsBrokenException.php'; |
|
| 266 | + include_once $path.'Exception/IOException.php'; |
|
| 267 | + include_once $path.'Exception/WrongKeyOrModifiedCiphertextException.php'; |
|
| 268 | + include_once $path.'Crypto.php'; |
|
| 269 | + include_once $path.'Encoding.php'; |
|
| 270 | + include_once $path.'DerivedKeys.php'; |
|
| 271 | + include_once $path.'Key.php'; |
|
| 272 | + include_once $path.'KeyOrPassword.php'; |
|
| 273 | + include_once $path.'File.php'; |
|
| 274 | + include_once $path.'RuntimeTests.php'; |
|
| 275 | + include_once $path.'KeyProtectedByPassword.php'; |
|
| 276 | + include_once $path.'Core.php'; |
|
| 277 | 277 | |
| 278 | 278 | try { |
| 279 | 279 | $user_key = $protected_key_encoded->unlockKey($psk); |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | */ |
| 315 | 315 | function trimElement($chaine, string $element): string |
| 316 | 316 | { |
| 317 | - if (! empty($chaine)) { |
|
| 317 | + if (!empty($chaine)) { |
|
| 318 | 318 | if (is_array($chaine) === true) { |
| 319 | 319 | $chaine = implode(';', $chaine); |
| 320 | 320 | } |
@@ -362,8 +362,8 @@ discard block |
||
| 362 | 362 | */ |
| 363 | 363 | function db_error_handler(array $params): void |
| 364 | 364 | { |
| 365 | - echo 'Error: ' . $params['error'] . "<br>\n"; |
|
| 366 | - echo 'Query: ' . $params['query'] . "<br>\n"; |
|
| 365 | + echo 'Error: '.$params['error']."<br>\n"; |
|
| 366 | + echo 'Query: '.$params['query']."<br>\n"; |
|
| 367 | 367 | throw new Exception('Error - Query', 1); |
| 368 | 368 | } |
| 369 | 369 | |
@@ -385,12 +385,12 @@ discard block |
||
| 385 | 385 | $SETTINGS |
| 386 | 386 | ) { |
| 387 | 387 | //load ClassLoader |
| 388 | - include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 388 | + include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 389 | 389 | // Load superglobal |
| 390 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 390 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 391 | 391 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 392 | 392 | //Connect to DB |
| 393 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 393 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 394 | 394 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 395 | 395 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 396 | 396 | } |
@@ -403,7 +403,7 @@ discard block |
||
| 403 | 403 | DB::$ssl = DB_SSL; |
| 404 | 404 | DB::$connect_options = DB_CONNECT_OPTIONS; |
| 405 | 405 | //Build tree |
| 406 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 406 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 407 | 407 | $tree->register(); |
| 408 | 408 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 409 | 409 | |
@@ -448,7 +448,7 @@ discard block |
||
| 448 | 448 | function identAdmin($idFonctions, $SETTINGS, $tree) |
| 449 | 449 | { |
| 450 | 450 | // Load superglobal |
| 451 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 451 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 452 | 452 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 453 | 453 | // Init |
| 454 | 454 | $groupesVisibles = []; |
@@ -467,7 +467,7 @@ discard block |
||
| 467 | 467 | $globalsVisibleFolders = $superGlobal->get('groupes_visibles', 'SESSION'); |
| 468 | 468 | $globalsPersonalVisibleFolders = $superGlobal->get('personal_visible_groups', 'SESSION'); |
| 469 | 469 | // Get list of Folders |
| 470 | - $rows = DB::query('SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', 0); |
|
| 470 | + $rows = DB::query('SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', 0); |
|
| 471 | 471 | foreach ($rows as $record) { |
| 472 | 472 | array_push($groupesVisibles, $record['id']); |
| 473 | 473 | } |
@@ -486,7 +486,7 @@ discard block |
||
| 486 | 486 | } |
| 487 | 487 | // Get ID of personal folder |
| 488 | 488 | $persfld = DB::queryfirstrow( |
| 489 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', |
|
| 489 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE title = %s', |
|
| 490 | 490 | $globalsUserId |
| 491 | 491 | ); |
| 492 | 492 | if (empty($persfld['id']) === false) { |
@@ -507,20 +507,20 @@ discard block |
||
| 507 | 507 | // get complete list of ROLES |
| 508 | 508 | $tmp = explode(';', $idFonctions); |
| 509 | 509 | $rows = DB::query( |
| 510 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
| 510 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
| 511 | 511 | ORDER BY title ASC' |
| 512 | 512 | ); |
| 513 | 513 | foreach ($rows as $record) { |
| 514 | - if (! empty($record['id']) && ! in_array($record['id'], $tmp)) { |
|
| 514 | + if (!empty($record['id']) && !in_array($record['id'], $tmp)) { |
|
| 515 | 515 | array_push($tmp, $record['id']); |
| 516 | 516 | } |
| 517 | 517 | } |
| 518 | 518 | $superGlobal->put('fonction_id', implode(';', $tmp), 'SESSION'); |
| 519 | 519 | $superGlobal->put('is_admin', 1, 'SESSION'); |
| 520 | 520 | // Check if admin has created Folders and Roles |
| 521 | - DB::query('SELECT * FROM ' . prefixTable('nested_tree') . ''); |
|
| 521 | + DB::query('SELECT * FROM '.prefixTable('nested_tree').''); |
|
| 522 | 522 | $superGlobal->put('nb_folders', DB::count(), 'SESSION'); |
| 523 | - DB::query('SELECT * FROM ' . prefixTable('roles_title')); |
|
| 523 | + DB::query('SELECT * FROM '.prefixTable('roles_title')); |
|
| 524 | 524 | $superGlobal->put('nb_roles', DB::count(), 'SESSION'); |
| 525 | 525 | |
| 526 | 526 | return true; |
@@ -566,7 +566,7 @@ discard block |
||
| 566 | 566 | object $tree |
| 567 | 567 | ) { |
| 568 | 568 | // Load superglobal |
| 569 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 569 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 570 | 570 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 571 | 571 | // Init |
| 572 | 572 | $superGlobal->put('groupes_visibles', [], 'SESSION'); |
@@ -605,10 +605,10 @@ discard block |
||
| 605 | 605 | // Does this user is allowed to see other items |
| 606 | 606 | $inc = 0; |
| 607 | 607 | $rows = DB::query( |
| 608 | - 'SELECT id, id_tree FROM ' . prefixTable('items') . ' |
|
| 608 | + 'SELECT id, id_tree FROM '.prefixTable('items').' |
|
| 609 | 609 | WHERE restricted_to LIKE %ss AND inactif = %s'. |
| 610 | 610 | (count($allowedFolders) > 0 ? ' AND id_tree NOT IN ('.implode(',', $allowedFolders).')' : ''), |
| 611 | - $globalsUserId . ';', |
|
| 611 | + $globalsUserId.';', |
|
| 612 | 612 | '0' |
| 613 | 613 | ); |
| 614 | 614 | foreach ($rows as $record) { |
@@ -622,8 +622,8 @@ discard block |
||
| 622 | 622 | // Check for the users roles if some specific rights exist on items |
| 623 | 623 | $rows = DB::query( |
| 624 | 624 | 'SELECT i.id_tree, r.item_id |
| 625 | - FROM ' . prefixTable('items') . ' as i |
|
| 626 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (r.item_id=i.id) |
|
| 625 | + FROM ' . prefixTable('items').' as i |
|
| 626 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (r.item_id=i.id) |
|
| 627 | 627 | WHERE r.role_id IN %li AND i.id_tree <> "" |
| 628 | 628 | ORDER BY i.id_tree ASC', |
| 629 | 629 | $userRoles |
@@ -677,16 +677,16 @@ discard block |
||
| 677 | 677 | 'SESSION' |
| 678 | 678 | ); |
| 679 | 679 | // Folders and Roles numbers |
| 680 | - DB::queryfirstrow('SELECT id FROM ' . prefixTable('nested_tree') . ''); |
|
| 680 | + DB::queryfirstrow('SELECT id FROM '.prefixTable('nested_tree').''); |
|
| 681 | 681 | $superGlobal->put('nb_folders', DB::count(), 'SESSION'); |
| 682 | - DB::queryfirstrow('SELECT id FROM ' . prefixTable('roles_title')); |
|
| 682 | + DB::queryfirstrow('SELECT id FROM '.prefixTable('roles_title')); |
|
| 683 | 683 | $superGlobal->put('nb_roles', DB::count(), 'SESSION'); |
| 684 | 684 | // check if change proposals on User's items |
| 685 | 685 | if (isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1) { |
| 686 | 686 | $countNewItems = DB::query( |
| 687 | 687 | 'SELECT COUNT(*) |
| 688 | - FROM ' . prefixTable('items_change') . ' AS c |
|
| 689 | - LEFT JOIN ' . prefixTable('log_items') . ' AS i ON (c.item_id = i.id_item) |
|
| 688 | + FROM ' . prefixTable('items_change').' AS c |
|
| 689 | + LEFT JOIN ' . prefixTable('log_items').' AS i ON (c.item_id = i.id_item) |
|
| 690 | 690 | WHERE i.action = %s AND i.id_user = %i', |
| 691 | 691 | 'at_creation', |
| 692 | 692 | $globalsUserId |
@@ -714,7 +714,7 @@ discard block |
||
| 714 | 714 | |
| 715 | 715 | $rows = DB::query( |
| 716 | 716 | 'SELECT * |
| 717 | - FROM ' . prefixTable('roles_values') . ' |
|
| 717 | + FROM ' . prefixTable('roles_values').' |
|
| 718 | 718 | WHERE role_id IN %li AND type IN %ls', |
| 719 | 719 | $userRoles, |
| 720 | 720 | ['W', 'ND', 'NE', 'NDNE', 'R'] |
@@ -781,7 +781,7 @@ discard block |
||
| 781 | 781 | ) { |
| 782 | 782 | $persoFld = DB::queryfirstrow( |
| 783 | 783 | 'SELECT id |
| 784 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 784 | + FROM ' . prefixTable('nested_tree').' |
|
| 785 | 785 | WHERE title = %s AND personal_folder = %i'. |
| 786 | 786 | (count($allowedFolders) > 0 ? ' AND id NOT IN ('.implode(',', $allowedFolders).')' : ''), |
| 787 | 787 | $globalsUserId, |
@@ -814,7 +814,7 @@ discard block |
||
| 814 | 814 | } |
| 815 | 815 | $persoFlds = DB::query( |
| 816 | 816 | 'SELECT id |
| 817 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 817 | + FROM ' . prefixTable('nested_tree').' |
|
| 818 | 818 | WHERE %l', |
| 819 | 819 | $where |
| 820 | 820 | ); |
@@ -878,9 +878,9 @@ discard block |
||
| 878 | 878 | */ |
| 879 | 879 | function cacheTableRefresh(array $SETTINGS): void |
| 880 | 880 | { |
| 881 | - include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 881 | + include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 882 | 882 | //Connect to DB |
| 883 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 883 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 884 | 884 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 885 | 885 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 886 | 886 | } |
@@ -897,12 +897,12 @@ discard block |
||
| 897 | 897 | $tree->register(); |
| 898 | 898 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 899 | 899 | // truncate table |
| 900 | - DB::query('TRUNCATE TABLE ' . prefixTable('cache')); |
|
| 900 | + DB::query('TRUNCATE TABLE '.prefixTable('cache')); |
|
| 901 | 901 | // reload date |
| 902 | 902 | $rows = DB::query( |
| 903 | 903 | 'SELECT * |
| 904 | - FROM ' . prefixTable('items') . ' as i |
|
| 905 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 904 | + FROM ' . prefixTable('items').' as i |
|
| 905 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 906 | 906 | AND l.action = %s |
| 907 | 907 | AND i.inactif = %i', |
| 908 | 908 | 'at_creation', |
@@ -914,18 +914,18 @@ discard block |
||
| 914 | 914 | $tags = ''; |
| 915 | 915 | $itemTags = DB::query( |
| 916 | 916 | 'SELECT tag |
| 917 | - FROM ' . prefixTable('tags') . ' |
|
| 917 | + FROM ' . prefixTable('tags').' |
|
| 918 | 918 | WHERE item_id = %i AND tag != ""', |
| 919 | 919 | $record['id'] |
| 920 | 920 | ); |
| 921 | 921 | foreach ($itemTags as $itemTag) { |
| 922 | - $tags .= $itemTag['tag'] . ' '; |
|
| 922 | + $tags .= $itemTag['tag'].' '; |
|
| 923 | 923 | } |
| 924 | 924 | |
| 925 | 925 | // Get renewal period |
| 926 | 926 | $resNT = DB::queryfirstrow( |
| 927 | 927 | 'SELECT renewal_period |
| 928 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 928 | + FROM ' . prefixTable('nested_tree').' |
|
| 929 | 929 | WHERE id = %i', |
| 930 | 930 | $record['id_tree'] |
| 931 | 931 | ); |
@@ -938,7 +938,7 @@ discard block |
||
| 938 | 938 | // Is this a User id? |
| 939 | 939 | $user = DB::queryfirstrow( |
| 940 | 940 | 'SELECT id, login |
| 941 | - FROM ' . prefixTable('users') . ' |
|
| 941 | + FROM ' . prefixTable('users').' |
|
| 942 | 942 | WHERE id = %i', |
| 943 | 943 | $elem->title |
| 944 | 944 | ); |
@@ -956,11 +956,11 @@ discard block |
||
| 956 | 956 | 'id' => $record['id'], |
| 957 | 957 | 'label' => $record['label'], |
| 958 | 958 | 'description' => $record['description'] ?? '', |
| 959 | - 'url' => isset($record['url']) && ! empty($record['url']) ? $record['url'] : '0', |
|
| 959 | + 'url' => isset($record['url']) && !empty($record['url']) ? $record['url'] : '0', |
|
| 960 | 960 | 'tags' => $tags, |
| 961 | 961 | 'id_tree' => $record['id_tree'], |
| 962 | 962 | 'perso' => $record['perso'], |
| 963 | - 'restricted_to' => isset($record['restricted_to']) && ! empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
| 963 | + 'restricted_to' => isset($record['restricted_to']) && !empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
| 964 | 964 | 'login' => $record['login'] ?? '', |
| 965 | 965 | 'folder' => implode(' > ', $folder), |
| 966 | 966 | 'author' => $record['id_user'], |
@@ -982,12 +982,12 @@ discard block |
||
| 982 | 982 | */ |
| 983 | 983 | function cacheTableUpdate(array $SETTINGS, ?int $ident = null): void |
| 984 | 984 | { |
| 985 | - include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 985 | + include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 986 | 986 | // Load superglobal |
| 987 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 987 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 988 | 988 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 989 | 989 | //Connect to DB |
| 990 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 990 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 991 | 991 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 992 | 992 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 993 | 993 | } |
@@ -1006,7 +1006,7 @@ discard block |
||
| 1006 | 1006 | // get new value from db |
| 1007 | 1007 | $data = DB::queryfirstrow( |
| 1008 | 1008 | 'SELECT label, description, id_tree, perso, restricted_to, login, url |
| 1009 | - FROM ' . prefixTable('items') . ' |
|
| 1009 | + FROM ' . prefixTable('items').' |
|
| 1010 | 1010 | WHERE id=%i', |
| 1011 | 1011 | $ident |
| 1012 | 1012 | ); |
@@ -1014,12 +1014,12 @@ discard block |
||
| 1014 | 1014 | $tags = ''; |
| 1015 | 1015 | $itemTags = DB::query( |
| 1016 | 1016 | 'SELECT tag |
| 1017 | - FROM ' . prefixTable('tags') . ' |
|
| 1017 | + FROM ' . prefixTable('tags').' |
|
| 1018 | 1018 | WHERE item_id = %i AND tag != ""', |
| 1019 | 1019 | $ident |
| 1020 | 1020 | ); |
| 1021 | 1021 | foreach ($itemTags as $itemTag) { |
| 1022 | - $tags .= $itemTag['tag'] . ' '; |
|
| 1022 | + $tags .= $itemTag['tag'].' '; |
|
| 1023 | 1023 | } |
| 1024 | 1024 | // form id_tree to full foldername |
| 1025 | 1025 | $folder = []; |
@@ -1030,7 +1030,7 @@ discard block |
||
| 1030 | 1030 | // Is this a User id? |
| 1031 | 1031 | $user = DB::queryfirstrow( |
| 1032 | 1032 | 'SELECT id, login |
| 1033 | - FROM ' . prefixTable('users') . ' |
|
| 1033 | + FROM ' . prefixTable('users').' |
|
| 1034 | 1034 | WHERE id = %i', |
| 1035 | 1035 | $elem->title |
| 1036 | 1036 | ); |
@@ -1048,10 +1048,10 @@ discard block |
||
| 1048 | 1048 | 'label' => $data['label'], |
| 1049 | 1049 | 'description' => $data['description'], |
| 1050 | 1050 | 'tags' => $tags, |
| 1051 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
| 1051 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
| 1052 | 1052 | 'id_tree' => $data['id_tree'], |
| 1053 | 1053 | 'perso' => $data['perso'], |
| 1054 | - 'restricted_to' => isset($data['restricted_to']) && ! empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
| 1054 | + 'restricted_to' => isset($data['restricted_to']) && !empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
| 1055 | 1055 | 'login' => $data['login'] ?? '', |
| 1056 | 1056 | 'folder' => implode(' » ', $folder), |
| 1057 | 1057 | 'author' => $superGlobal->get('user_id', 'SESSION'), |
@@ -1071,14 +1071,14 @@ discard block |
||
| 1071 | 1071 | */ |
| 1072 | 1072 | function cacheTableAdd(array $SETTINGS, ?int $ident = null): void |
| 1073 | 1073 | { |
| 1074 | - include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 1074 | + include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 1075 | 1075 | // Load superglobal |
| 1076 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1076 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1077 | 1077 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 1078 | 1078 | // Get superglobals |
| 1079 | 1079 | $globalsUserId = $superGlobal->get('user_id', 'SESSION'); |
| 1080 | 1080 | //Connect to DB |
| 1081 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 1081 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 1082 | 1082 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 1083 | 1083 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 1084 | 1084 | } |
@@ -1097,8 +1097,8 @@ discard block |
||
| 1097 | 1097 | // get new value from db |
| 1098 | 1098 | $data = DB::queryFirstRow( |
| 1099 | 1099 | 'SELECT i.label, i.description, i.id_tree as id_tree, i.perso, i.restricted_to, i.id, i.login, i.url, l.date |
| 1100 | - FROM ' . prefixTable('items') . ' as i |
|
| 1101 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 1100 | + FROM ' . prefixTable('items').' as i |
|
| 1101 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 1102 | 1102 | WHERE i.id = %i |
| 1103 | 1103 | AND l.action = %s', |
| 1104 | 1104 | $ident, |
@@ -1108,12 +1108,12 @@ discard block |
||
| 1108 | 1108 | $tags = ''; |
| 1109 | 1109 | $itemTags = DB::query( |
| 1110 | 1110 | 'SELECT tag |
| 1111 | - FROM ' . prefixTable('tags') . ' |
|
| 1111 | + FROM ' . prefixTable('tags').' |
|
| 1112 | 1112 | WHERE item_id = %i AND tag != ""', |
| 1113 | 1113 | $ident |
| 1114 | 1114 | ); |
| 1115 | 1115 | foreach ($itemTags as $itemTag) { |
| 1116 | - $tags .= $itemTag['tag'] . ' '; |
|
| 1116 | + $tags .= $itemTag['tag'].' '; |
|
| 1117 | 1117 | } |
| 1118 | 1118 | // form id_tree to full foldername |
| 1119 | 1119 | $folder = []; |
@@ -1124,7 +1124,7 @@ discard block |
||
| 1124 | 1124 | // Is this a User id? |
| 1125 | 1125 | $user = DB::queryfirstrow( |
| 1126 | 1126 | 'SELECT id, login |
| 1127 | - FROM ' . prefixTable('users') . ' |
|
| 1127 | + FROM ' . prefixTable('users').' |
|
| 1128 | 1128 | WHERE id = %i', |
| 1129 | 1129 | $elem->title |
| 1130 | 1130 | ); |
@@ -1143,7 +1143,7 @@ discard block |
||
| 1143 | 1143 | 'label' => $data['label'], |
| 1144 | 1144 | 'description' => $data['description'], |
| 1145 | 1145 | 'tags' => isset($tags) && empty($tags) === false ? $tags : 'None', |
| 1146 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
| 1146 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
| 1147 | 1147 | 'id_tree' => $data['id_tree'], |
| 1148 | 1148 | 'perso' => isset($data['perso']) && empty($data['perso']) === false && $data['perso'] !== 'None' ? $data['perso'] : '0', |
| 1149 | 1149 | 'restricted_to' => isset($data['restricted_to']) && empty($data['restricted_to']) === false ? $data['restricted_to'] : '0', |
@@ -1165,52 +1165,52 @@ discard block |
||
| 1165 | 1165 | function getStatisticsData(array $SETTINGS): array |
| 1166 | 1166 | { |
| 1167 | 1167 | DB::query( |
| 1168 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 1168 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 1169 | 1169 | 0 |
| 1170 | 1170 | ); |
| 1171 | 1171 | $counter_folders = DB::count(); |
| 1172 | 1172 | DB::query( |
| 1173 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 1173 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 1174 | 1174 | 1 |
| 1175 | 1175 | ); |
| 1176 | 1176 | $counter_folders_perso = DB::count(); |
| 1177 | 1177 | DB::query( |
| 1178 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
| 1178 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
| 1179 | 1179 | 0 |
| 1180 | 1180 | ); |
| 1181 | 1181 | $counter_items = DB::count(); |
| 1182 | 1182 | DB::query( |
| 1183 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
| 1183 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
| 1184 | 1184 | 1 |
| 1185 | 1185 | ); |
| 1186 | 1186 | $counter_items_perso = DB::count(); |
| 1187 | 1187 | DB::query( |
| 1188 | - 'SELECT id FROM ' . prefixTable('users') . '' |
|
| 1188 | + 'SELECT id FROM '.prefixTable('users').'' |
|
| 1189 | 1189 | ); |
| 1190 | 1190 | $counter_users = DB::count(); |
| 1191 | 1191 | DB::query( |
| 1192 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE admin = %i', |
|
| 1192 | + 'SELECT id FROM '.prefixTable('users').' WHERE admin = %i', |
|
| 1193 | 1193 | 1 |
| 1194 | 1194 | ); |
| 1195 | 1195 | $admins = DB::count(); |
| 1196 | 1196 | DB::query( |
| 1197 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE gestionnaire = %i', |
|
| 1197 | + 'SELECT id FROM '.prefixTable('users').' WHERE gestionnaire = %i', |
|
| 1198 | 1198 | 1 |
| 1199 | 1199 | ); |
| 1200 | 1200 | $managers = DB::count(); |
| 1201 | 1201 | DB::query( |
| 1202 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE read_only = %i', |
|
| 1202 | + 'SELECT id FROM '.prefixTable('users').' WHERE read_only = %i', |
|
| 1203 | 1203 | 1 |
| 1204 | 1204 | ); |
| 1205 | 1205 | $readOnly = DB::count(); |
| 1206 | 1206 | // list the languages |
| 1207 | 1207 | $usedLang = []; |
| 1208 | 1208 | $tp_languages = DB::query( |
| 1209 | - 'SELECT name FROM ' . prefixTable('languages') |
|
| 1209 | + 'SELECT name FROM '.prefixTable('languages') |
|
| 1210 | 1210 | ); |
| 1211 | 1211 | foreach ($tp_languages as $tp_language) { |
| 1212 | 1212 | DB::query( |
| 1213 | - 'SELECT * FROM ' . prefixTable('users') . ' WHERE user_language = %s', |
|
| 1213 | + 'SELECT * FROM '.prefixTable('users').' WHERE user_language = %s', |
|
| 1214 | 1214 | $tp_language['name'] |
| 1215 | 1215 | ); |
| 1216 | 1216 | $usedLang[$tp_language['name']] = round((DB::count() * 100 / $counter_users), 0); |
@@ -1219,12 +1219,12 @@ discard block |
||
| 1219 | 1219 | // get list of ips |
| 1220 | 1220 | $usedIp = []; |
| 1221 | 1221 | $tp_ips = DB::query( |
| 1222 | - 'SELECT user_ip FROM ' . prefixTable('users') |
|
| 1222 | + 'SELECT user_ip FROM '.prefixTable('users') |
|
| 1223 | 1223 | ); |
| 1224 | 1224 | foreach ($tp_ips as $ip) { |
| 1225 | 1225 | if (array_key_exists($ip['user_ip'], $usedIp)) { |
| 1226 | 1226 | $usedIp[$ip['user_ip']] += $usedIp[$ip['user_ip']]; |
| 1227 | - } elseif (! empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
| 1227 | + } elseif (!empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
| 1228 | 1228 | $usedIp[$ip['user_ip']] = 1; |
| 1229 | 1229 | } |
| 1230 | 1230 | } |
@@ -1290,21 +1290,21 @@ discard block |
||
| 1290 | 1290 | } |
| 1291 | 1291 | |
| 1292 | 1292 | // Load settings |
| 1293 | - include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 1293 | + include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 1294 | 1294 | // Load superglobal |
| 1295 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1295 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1296 | 1296 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 1297 | 1297 | // Get user language |
| 1298 | - include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . (null !== $superGlobal->get('user_language', 'SESSION') ? $superGlobal->get('user_language', 'SESSION') : 'english') . '.php'; |
|
| 1298 | + include_once $SETTINGS['cpassman_dir'].'/includes/language/'.(null !== $superGlobal->get('user_language', 'SESSION') ? $superGlobal->get('user_language', 'SESSION') : 'english').'.php'; |
|
| 1299 | 1299 | // Load library |
| 1300 | - include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 1300 | + include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 1301 | 1301 | // load PHPMailer |
| 1302 | - $mail = new SplClassLoader('PHPMailer\PHPMailer', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 1302 | + $mail = new SplClassLoader('PHPMailer\PHPMailer', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 1303 | 1303 | $mail->register(); |
| 1304 | 1304 | $mail = new PHPMailer\PHPMailer\PHPMailer(true); |
| 1305 | 1305 | |
| 1306 | 1306 | // send to user |
| 1307 | - $mail->setLanguage('en', $SETTINGS['cpassman_dir'] . '/includes/libraries/PHPMailer/PHPMailer/language/'); |
|
| 1307 | + $mail->setLanguage('en', $SETTINGS['cpassman_dir'].'/includes/libraries/PHPMailer/PHPMailer/language/'); |
|
| 1308 | 1308 | $mail->SMTPDebug = isset($SETTINGS['email_debug_level']) === true ? $SETTINGS['email_debug_level'] : 0; |
| 1309 | 1309 | $mail->Port = (int) $SETTINGS['email_port']; |
| 1310 | 1310 | //COULD BE USED |
@@ -1411,7 +1411,7 @@ discard block |
||
| 1411 | 1411 | <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;"> |
| 1412 | 1412 | <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;"> |
| 1413 | 1413 | <br><div style="float:right;">' . |
| 1414 | - $textMail . |
|
| 1414 | + $textMail. |
|
| 1415 | 1415 | '<br><br></td></tr></table> |
| 1416 | 1416 | </td></tr></table> |
| 1417 | 1417 | <br></body></html>'; |
@@ -1424,7 +1424,7 @@ discard block |
||
| 1424 | 1424 | */ |
| 1425 | 1425 | function generateKey(): string |
| 1426 | 1426 | { |
| 1427 | - return substr(md5(rand() . rand()), 0, 15); |
|
| 1427 | + return substr(md5(rand().rand()), 0, 15); |
|
| 1428 | 1428 | } |
| 1429 | 1429 | |
| 1430 | 1430 | /** |
@@ -1495,7 +1495,7 @@ discard block |
||
| 1495 | 1495 | { |
| 1496 | 1496 | array_walk_recursive( |
| 1497 | 1497 | $array, |
| 1498 | - static function (&$item): void { |
|
| 1498 | + static function(&$item): void { |
|
| 1499 | 1499 | if (mb_detect_encoding((string) $item, 'utf-8', true) === false) { |
| 1500 | 1500 | $item = utf8_encode($item); |
| 1501 | 1501 | } |
@@ -1516,9 +1516,9 @@ discard block |
||
| 1516 | 1516 | */ |
| 1517 | 1517 | function prepareExchangedData($teampassDir, $data, string $type, ?string $key = null) |
| 1518 | 1518 | { |
| 1519 | - $teampassDir = __DIR__ . '/..'; |
|
| 1519 | + $teampassDir = __DIR__.'/..'; |
|
| 1520 | 1520 | // Load superglobal |
| 1521 | - include_once $teampassDir . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1521 | + include_once $teampassDir.'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1522 | 1522 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 1523 | 1523 | // Get superglobals |
| 1524 | 1524 | if ($key !== null) { |
@@ -1529,10 +1529,10 @@ discard block |
||
| 1529 | 1529 | } |
| 1530 | 1530 | |
| 1531 | 1531 | //load Encoding |
| 1532 | - include_once $teampassDir . '/includes/libraries/ForceUTF8/Encoding.php'; |
|
| 1532 | + include_once $teampassDir.'/includes/libraries/ForceUTF8/Encoding.php'; |
|
| 1533 | 1533 | |
| 1534 | 1534 | //Load CRYPTOJS |
| 1535 | - include_once $teampassDir . '/includes/libraries/Encryption/CryptoJs/Encryption.php'; |
|
| 1535 | + include_once $teampassDir.'/includes/libraries/Encryption/CryptoJs/Encryption.php'; |
|
| 1536 | 1536 | |
| 1537 | 1537 | // Perform |
| 1538 | 1538 | if ($type === 'encode' && is_array($data) === true) { |
@@ -1605,8 +1605,8 @@ discard block |
||
| 1605 | 1605 | */ |
| 1606 | 1606 | function prefixTable(string $table): string |
| 1607 | 1607 | { |
| 1608 | - $safeTable = htmlspecialchars(DB_PREFIX . $table); |
|
| 1609 | - if (! empty($safeTable)) { |
|
| 1608 | + $safeTable = htmlspecialchars(DB_PREFIX.$table); |
|
| 1609 | + if (!empty($safeTable)) { |
|
| 1610 | 1610 | // sanitize string |
| 1611 | 1611 | return $safeTable; |
| 1612 | 1612 | } |
@@ -1636,13 +1636,13 @@ discard block |
||
| 1636 | 1636 | bool $lowercase = false, |
| 1637 | 1637 | array $SETTINGS = [] |
| 1638 | 1638 | ): string { |
| 1639 | - include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 1640 | - $generator = new SplClassLoader('PasswordGenerator\Generator', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 1639 | + include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 1640 | + $generator = new SplClassLoader('PasswordGenerator\Generator', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 1641 | 1641 | $generator->register(); |
| 1642 | 1642 | $generator = new PasswordGenerator\Generator\ComputerPasswordGenerator(); |
| 1643 | 1643 | // Is PHP7 being used? |
| 1644 | 1644 | if (version_compare(PHP_VERSION, '7.0.0', '>=')) { |
| 1645 | - $php7generator = new SplClassLoader('PasswordGenerator\RandomGenerator', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 1645 | + $php7generator = new SplClassLoader('PasswordGenerator\RandomGenerator', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 1646 | 1646 | $php7generator->register(); |
| 1647 | 1647 | $generator->setRandomGenerator(new PasswordGenerator\RandomGenerator\Php7RandomGenerator()); |
| 1648 | 1648 | } |
@@ -1677,7 +1677,7 @@ discard block |
||
| 1677 | 1677 | function send_syslog($message, $host, $port, $component = 'teampass'): void |
| 1678 | 1678 | { |
| 1679 | 1679 | $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP); |
| 1680 | - $syslog_message = '<123>' . date('M d H:i:s ') . $component . ': ' . $message; |
|
| 1680 | + $syslog_message = '<123>'.date('M d H:i:s ').$component.': '.$message; |
|
| 1681 | 1681 | socket_sendto($sock, (string) $syslog_message, strlen($syslog_message), 0, (string) $host, (int) $port); |
| 1682 | 1682 | socket_close($sock); |
| 1683 | 1683 | } |
@@ -1701,7 +1701,7 @@ discard block |
||
| 1701 | 1701 | } |
| 1702 | 1702 | |
| 1703 | 1703 | // include librairies & connect to DB |
| 1704 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 1704 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 1705 | 1705 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 1706 | 1706 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 1707 | 1707 | } |
@@ -1727,14 +1727,14 @@ discard block |
||
| 1727 | 1727 | if (isset($SETTINGS['syslog_enable']) === true && (int) $SETTINGS['syslog_enable'] === 1) { |
| 1728 | 1728 | if ($type === 'user_mngt') { |
| 1729 | 1729 | send_syslog( |
| 1730 | - 'action=' . str_replace('at_', '', $label) . ' attribute=user user=' . $who . ' userid="' . $login . '" change="' . $field_1 . '" ', |
|
| 1730 | + 'action='.str_replace('at_', '', $label).' attribute=user user='.$who.' userid="'.$login.'" change="'.$field_1.'" ', |
|
| 1731 | 1731 | $SETTINGS['syslog_host'], |
| 1732 | 1732 | $SETTINGS['syslog_port'], |
| 1733 | 1733 | 'teampass' |
| 1734 | 1734 | ); |
| 1735 | 1735 | } else { |
| 1736 | 1736 | send_syslog( |
| 1737 | - 'action=' . $type . ' attribute=' . $label . ' user=' . $who . ' userid="' . $login . '" ', |
|
| 1737 | + 'action='.$type.' attribute='.$label.' user='.$who.' userid="'.$login.'" ', |
|
| 1738 | 1738 | $SETTINGS['syslog_host'], |
| 1739 | 1739 | $SETTINGS['syslog_port'], |
| 1740 | 1740 | 'teampass' |
@@ -1768,7 +1768,7 @@ discard block |
||
| 1768 | 1768 | ?string $encryption_type = null |
| 1769 | 1769 | ): void { |
| 1770 | 1770 | // include librairies & connect to DB |
| 1771 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 1771 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 1772 | 1772 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 1773 | 1773 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 1774 | 1774 | } |
@@ -1814,7 +1814,7 @@ discard block |
||
| 1814 | 1814 | if (empty($item_label) === true) { |
| 1815 | 1815 | $dataItem = DB::queryfirstrow( |
| 1816 | 1816 | 'SELECT id, id_tree, label |
| 1817 | - FROM ' . prefixTable('items') . ' |
|
| 1817 | + FROM ' . prefixTable('items').' |
|
| 1818 | 1818 | WHERE id = %i', |
| 1819 | 1819 | $item_id |
| 1820 | 1820 | ); |
@@ -1822,11 +1822,11 @@ discard block |
||
| 1822 | 1822 | } |
| 1823 | 1823 | |
| 1824 | 1824 | send_syslog( |
| 1825 | - 'action=' . str_replace('at_', '', $action) . |
|
| 1826 | - ' attribute=' . str_replace('at_', '', $attribute[0]) . |
|
| 1827 | - ' itemno=' . $item_id . |
|
| 1828 | - ' user=' . is_null($login) === true ? '' : addslashes((string) $login) . |
|
| 1829 | - ' itemname="' . addslashes($item_label) . '"', |
|
| 1825 | + 'action='.str_replace('at_', '', $action). |
|
| 1826 | + ' attribute='.str_replace('at_', '', $attribute[0]). |
|
| 1827 | + ' itemno='.$item_id. |
|
| 1828 | + ' user='.is_null($login) === true ? '' : addslashes((string) $login). |
|
| 1829 | + ' itemname="'.addslashes($item_label).'"', |
|
| 1830 | 1830 | $SETTINGS['syslog_host'], |
| 1831 | 1831 | $SETTINGS['syslog_port'], |
| 1832 | 1832 | 'teampass' |
@@ -1854,7 +1854,7 @@ discard block |
||
| 1854 | 1854 | && $action === 'at_shown' |
| 1855 | 1855 | ) { |
| 1856 | 1856 | // Load superglobal |
| 1857 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1857 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1858 | 1858 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 1859 | 1859 | // Get superglobals |
| 1860 | 1860 | $globalsLastname = $superGlobal->get('lastname', 'SESSION'); |
@@ -1863,7 +1863,7 @@ discard block |
||
| 1863 | 1863 | // Get info about item |
| 1864 | 1864 | $dataItem = DB::queryfirstrow( |
| 1865 | 1865 | 'SELECT id, id_tree, label |
| 1866 | - FROM ' . prefixTable('items') . ' |
|
| 1866 | + FROM ' . prefixTable('items').' |
|
| 1867 | 1867 | WHERE id = %i', |
| 1868 | 1868 | $item_id |
| 1869 | 1869 | ); |
@@ -1877,9 +1877,9 @@ discard block |
||
| 1877 | 1877 | 'body' => str_replace( |
| 1878 | 1878 | ['#tp_user#', '#tp_item#', '#tp_link#'], |
| 1879 | 1879 | [ |
| 1880 | - addslashes($globalsName . ' ' . $globalsLastname), |
|
| 1880 | + addslashes($globalsName.' '.$globalsLastname), |
|
| 1881 | 1881 | addslashes($item_label), |
| 1882 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $item_id, |
|
| 1882 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$item_id, |
|
| 1883 | 1883 | ], |
| 1884 | 1884 | langHdl('email_on_open_notification_mail') |
| 1885 | 1885 | ), |
@@ -1903,7 +1903,7 @@ discard block |
||
| 1903 | 1903 | function notifyChangesToSubscribers(int $item_id, string $label, array $changes, array $SETTINGS): void |
| 1904 | 1904 | { |
| 1905 | 1905 | // Load superglobal |
| 1906 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1906 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1907 | 1907 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 1908 | 1908 | // Get superglobals |
| 1909 | 1909 | $globalsUserId = $superGlobal->get('user_id', 'SESSION'); |
@@ -1913,8 +1913,8 @@ discard block |
||
| 1913 | 1913 | $notification = DB::queryOneColumn( |
| 1914 | 1914 | 'email', |
| 1915 | 1915 | 'SELECT * |
| 1916 | - FROM ' . prefixTable('notification') . ' AS n |
|
| 1917 | - INNER JOIN ' . prefixTable('users') . ' AS u ON (n.user_id = u.id) |
|
| 1916 | + FROM ' . prefixTable('notification').' AS n |
|
| 1917 | + INNER JOIN ' . prefixTable('users').' AS u ON (n.user_id = u.id) |
|
| 1918 | 1918 | WHERE n.item_id = %i AND n.user_id != %i', |
| 1919 | 1919 | $item_id, |
| 1920 | 1920 | $globalsUserId |
@@ -1925,7 +1925,7 @@ discard block |
||
| 1925 | 1925 | // Get list of changes |
| 1926 | 1926 | $htmlChanges = '<ul>'; |
| 1927 | 1927 | foreach ($changes as $change) { |
| 1928 | - $htmlChanges .= '<li>' . $change . '</li>'; |
|
| 1928 | + $htmlChanges .= '<li>'.$change.'</li>'; |
|
| 1929 | 1929 | } |
| 1930 | 1930 | $htmlChanges .= '</ul>'; |
| 1931 | 1931 | // send email |
@@ -1958,7 +1958,7 @@ discard block |
||
| 1958 | 1958 | function geItemReadablePath(int $id_tree, string $label, array $SETTINGS): string |
| 1959 | 1959 | { |
| 1960 | 1960 | // Class loader |
| 1961 | - include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 1961 | + include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 1962 | 1962 | //Load Tree |
| 1963 | 1963 | $tree = new SplClassLoader('Tree\NestedTree', '../includes/libraries'); |
| 1964 | 1964 | $tree->register(); |
@@ -1967,15 +1967,15 @@ discard block |
||
| 1967 | 1967 | $path = ''; |
| 1968 | 1968 | foreach ($arbo as $elem) { |
| 1969 | 1969 | if (empty($path) === true) { |
| 1970 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 1970 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 1971 | 1971 | } else { |
| 1972 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 1972 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 1973 | 1973 | } |
| 1974 | 1974 | } |
| 1975 | 1975 | |
| 1976 | 1976 | // Build text to show user |
| 1977 | 1977 | if (empty($label) === false) { |
| 1978 | - return empty($path) === true ? addslashes($label) : addslashes($label) . ' (' . $path . ')'; |
|
| 1978 | + return empty($path) === true ? addslashes($label) : addslashes($label).' ('.$path.')'; |
|
| 1979 | 1979 | } |
| 1980 | 1980 | return empty($path) === true ? '' : $path; |
| 1981 | 1981 | } |
@@ -2032,9 +2032,9 @@ discard block |
||
| 2032 | 2032 | */ |
| 2033 | 2033 | function handleConfigFile($action, $SETTINGS, $field = null, $value = null) |
| 2034 | 2034 | { |
| 2035 | - $tp_config_file = $SETTINGS['cpassman_dir'] . '/includes/config/tp.config.php'; |
|
| 2035 | + $tp_config_file = $SETTINGS['cpassman_dir'].'/includes/config/tp.config.php'; |
|
| 2036 | 2036 | // include librairies & connect to DB |
| 2037 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 2037 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 2038 | 2038 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 2039 | 2039 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 2040 | 2040 | } |
@@ -2049,8 +2049,8 @@ discard block |
||
| 2049 | 2049 | if (file_exists($tp_config_file) === false || $action === 'rebuild') { |
| 2050 | 2050 | // perform a copy |
| 2051 | 2051 | if (file_exists($tp_config_file)) { |
| 2052 | - if (! copy($tp_config_file, $tp_config_file . '.' . date('Y_m_d_His', time()))) { |
|
| 2053 | - return "ERROR: Could not copy file '" . $tp_config_file . "'"; |
|
| 2052 | + if (!copy($tp_config_file, $tp_config_file.'.'.date('Y_m_d_His', time()))) { |
|
| 2053 | + return "ERROR: Could not copy file '".$tp_config_file."'"; |
|
| 2054 | 2054 | } |
| 2055 | 2055 | } |
| 2056 | 2056 | |
@@ -2060,11 +2060,11 @@ discard block |
||
| 2060 | 2060 | $data[1] = "global \$SETTINGS;\n"; |
| 2061 | 2061 | $data[2] = "\$SETTINGS = array (\n"; |
| 2062 | 2062 | $rows = DB::query( |
| 2063 | - 'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s', |
|
| 2063 | + 'SELECT * FROM '.prefixTable('misc').' WHERE type=%s', |
|
| 2064 | 2064 | 'admin' |
| 2065 | 2065 | ); |
| 2066 | 2066 | foreach ($rows as $record) { |
| 2067 | - array_push($data, " '" . $record['intitule'] . "' => '" . $record['valeur'] . "',\n"); |
|
| 2067 | + array_push($data, " '".$record['intitule']."' => '".$record['valeur']."',\n"); |
|
| 2068 | 2068 | } |
| 2069 | 2069 | array_push($data, ");\n"); |
| 2070 | 2070 | $data = array_unique($data); |
@@ -2078,15 +2078,15 @@ discard block |
||
| 2078 | 2078 | break; |
| 2079 | 2079 | } |
| 2080 | 2080 | |
| 2081 | - if (stristr($line, "'" . $field . "' => '")) { |
|
| 2082 | - $data[$inc] = " '" . $field . "' => '" . filter_var($value, FILTER_SANITIZE_STRING) . "',\n"; |
|
| 2081 | + if (stristr($line, "'".$field."' => '")) { |
|
| 2082 | + $data[$inc] = " '".$field."' => '".filter_var($value, FILTER_SANITIZE_STRING)."',\n"; |
|
| 2083 | 2083 | $bFound = true; |
| 2084 | 2084 | break; |
| 2085 | 2085 | } |
| 2086 | 2086 | ++$inc; |
| 2087 | 2087 | } |
| 2088 | 2088 | if ($bFound === false) { |
| 2089 | - $data[$inc] = " '" . $field . "' => '" . filter_var($value, FILTER_SANITIZE_STRING) . "',\n);\n"; |
|
| 2089 | + $data[$inc] = " '".$field."' => '".filter_var($value, FILTER_SANITIZE_STRING)."',\n);\n"; |
|
| 2090 | 2090 | } |
| 2091 | 2091 | } |
| 2092 | 2092 | |
@@ -2116,7 +2116,7 @@ discard block |
||
| 2116 | 2116 | { |
| 2117 | 2117 | global $SETTINGS; |
| 2118 | 2118 | /* LOAD CPASSMAN SETTINGS */ |
| 2119 | - if (! isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
| 2119 | + if (!isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
| 2120 | 2120 | $SETTINGS = []; |
| 2121 | 2121 | $SETTINGS['duplicate_folder'] = 0; |
| 2122 | 2122 | //by default, this is set to 0; |
@@ -2126,7 +2126,7 @@ discard block |
||
| 2126 | 2126 | //by default, this value is set to 5; |
| 2127 | 2127 | $settings = []; |
| 2128 | 2128 | $rows = DB::query( |
| 2129 | - 'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s_type OR type=%s_type2', |
|
| 2129 | + 'SELECT * FROM '.prefixTable('misc').' WHERE type=%s_type OR type=%s_type2', |
|
| 2130 | 2130 | [ |
| 2131 | 2131 | 'type' => 'admin', |
| 2132 | 2132 | 'type2' => 'settings', |
@@ -2158,7 +2158,7 @@ discard block |
||
| 2158 | 2158 | $source_cf = []; |
| 2159 | 2159 | $rows = DB::QUERY( |
| 2160 | 2160 | 'SELECT id_category |
| 2161 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 2161 | + FROM ' . prefixTable('categories_folders').' |
|
| 2162 | 2162 | WHERE id_folder = %i', |
| 2163 | 2163 | $source_id |
| 2164 | 2164 | ); |
@@ -2169,7 +2169,7 @@ discard block |
||
| 2169 | 2169 | $target_cf = []; |
| 2170 | 2170 | $rows = DB::QUERY( |
| 2171 | 2171 | 'SELECT id_category |
| 2172 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 2172 | + FROM ' . prefixTable('categories_folders').' |
|
| 2173 | 2173 | WHERE id_folder = %i', |
| 2174 | 2174 | $target_id |
| 2175 | 2175 | ); |
@@ -2204,9 +2204,9 @@ discard block |
||
| 2204 | 2204 | string $password = null |
| 2205 | 2205 | ) { |
| 2206 | 2206 | // Load AntiXSS |
| 2207 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php'; |
|
| 2208 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/ASCII.php'; |
|
| 2209 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/UTF8.php'; |
|
| 2207 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php'; |
|
| 2208 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/ASCII.php'; |
|
| 2209 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/UTF8.php'; |
|
| 2210 | 2210 | $antiXss = new voku\helper\AntiXSS(); |
| 2211 | 2211 | // Protect against bad inputs |
| 2212 | 2212 | if (is_array($source_file) === true || is_array($target_file) === true) { |
@@ -2218,7 +2218,7 @@ discard block |
||
| 2218 | 2218 | $target_file = $antiXss->xss_clean($target_file); |
| 2219 | 2219 | if (empty($password) === true || is_null($password) === true) { |
| 2220 | 2220 | // get KEY to define password |
| 2221 | - $ascii_key = file_get_contents(SECUREPATH . '/teampass-seckey.txt'); |
|
| 2221 | + $ascii_key = file_get_contents(SECUREPATH.'/teampass-seckey.txt'); |
|
| 2222 | 2222 | $password = \Defuse\Crypto\Key::loadFromAsciiSafeString($ascii_key); |
| 2223 | 2223 | } |
| 2224 | 2224 | |
@@ -2263,15 +2263,15 @@ discard block |
||
| 2263 | 2263 | ) { |
| 2264 | 2264 | // load PhpEncryption library |
| 2265 | 2265 | $path_to_encryption = '/includes/libraries/Encryption/Encryption/'; |
| 2266 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Crypto.php'; |
|
| 2267 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Encoding.php'; |
|
| 2268 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'DerivedKeys.php'; |
|
| 2269 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Key.php'; |
|
| 2270 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'KeyOrPassword.php'; |
|
| 2271 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'File.php'; |
|
| 2272 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'RuntimeTests.php'; |
|
| 2273 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'KeyProtectedByPassword.php'; |
|
| 2274 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Core.php'; |
|
| 2266 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Crypto.php'; |
|
| 2267 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Encoding.php'; |
|
| 2268 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'DerivedKeys.php'; |
|
| 2269 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Key.php'; |
|
| 2270 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'KeyOrPassword.php'; |
|
| 2271 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'File.php'; |
|
| 2272 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'RuntimeTests.php'; |
|
| 2273 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'KeyProtectedByPassword.php'; |
|
| 2274 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Core.php'; |
|
| 2275 | 2275 | try { |
| 2276 | 2276 | \Defuse\Crypto\File::encryptFileWithPassword( |
| 2277 | 2277 | $source_file, |
@@ -2308,15 +2308,15 @@ discard block |
||
| 2308 | 2308 | ) { |
| 2309 | 2309 | // load PhpEncryption library |
| 2310 | 2310 | $path_to_encryption = '/includes/libraries/Encryption/Encryption/'; |
| 2311 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Crypto.php'; |
|
| 2312 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Encoding.php'; |
|
| 2313 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'DerivedKeys.php'; |
|
| 2314 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Key.php'; |
|
| 2315 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'KeyOrPassword.php'; |
|
| 2316 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'File.php'; |
|
| 2317 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'RuntimeTests.php'; |
|
| 2318 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'KeyProtectedByPassword.php'; |
|
| 2319 | - include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Core.php'; |
|
| 2311 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Crypto.php'; |
|
| 2312 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Encoding.php'; |
|
| 2313 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'DerivedKeys.php'; |
|
| 2314 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Key.php'; |
|
| 2315 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'KeyOrPassword.php'; |
|
| 2316 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'File.php'; |
|
| 2317 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'RuntimeTests.php'; |
|
| 2318 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'KeyProtectedByPassword.php'; |
|
| 2319 | + include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Core.php'; |
|
| 2320 | 2320 | try { |
| 2321 | 2321 | \Defuse\Crypto\File::decryptFileWithPassword( |
| 2322 | 2322 | $source_file, |
@@ -2363,9 +2363,9 @@ discard block |
||
| 2363 | 2363 | function fileDelete(string $file, array $SETTINGS): void |
| 2364 | 2364 | { |
| 2365 | 2365 | // Load AntiXSS |
| 2366 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/ASCII.php'; |
|
| 2367 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/UTF8.php'; |
|
| 2368 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php'; |
|
| 2366 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/ASCII.php'; |
|
| 2367 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/UTF8.php'; |
|
| 2368 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php'; |
|
| 2369 | 2369 | $antiXss = new voku\helper\AntiXSS(); |
| 2370 | 2370 | $file = $antiXss->xss_clean($file); |
| 2371 | 2371 | if (is_file($file)) { |
@@ -2415,7 +2415,7 @@ discard block |
||
| 2415 | 2415 | int $dirPerm = 0755 |
| 2416 | 2416 | ) { |
| 2417 | 2417 | // Check if the path exists |
| 2418 | - if (! file_exists($path)) { |
|
| 2418 | + if (!file_exists($path)) { |
|
| 2419 | 2419 | return false; |
| 2420 | 2420 | } |
| 2421 | 2421 | |
@@ -2453,7 +2453,7 @@ discard block |
||
| 2453 | 2453 | */ |
| 2454 | 2454 | function accessToItemIsGranted(int $item_id, array $SETTINGS) |
| 2455 | 2455 | { |
| 2456 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 2456 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 2457 | 2457 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 2458 | 2458 | // Prepare superGlobal variables |
| 2459 | 2459 | $session_groupes_visibles = $superGlobal->get('groupes_visibles', 'SESSION'); |
@@ -2461,7 +2461,7 @@ discard block |
||
| 2461 | 2461 | // Load item data |
| 2462 | 2462 | $data = DB::queryFirstRow( |
| 2463 | 2463 | 'SELECT id_tree |
| 2464 | - FROM ' . prefixTable('items') . ' |
|
| 2464 | + FROM ' . prefixTable('items').' |
|
| 2465 | 2465 | WHERE id = %i', |
| 2466 | 2466 | $item_id |
| 2467 | 2467 | ); |
@@ -2524,7 +2524,7 @@ discard block |
||
| 2524 | 2524 | } |
| 2525 | 2525 | $host .= substr(explode(".", $email[1])[0], -1, 1); |
| 2526 | 2526 | } |
| 2527 | - $email = $name . "@" . $host . "." . explode(".", $email[1])[1]; |
|
| 2527 | + $email = $name."@".$host.".".explode(".", $email[1])[1]; |
|
| 2528 | 2528 | return $email; |
| 2529 | 2529 | } |
| 2530 | 2530 | |
@@ -2540,8 +2540,8 @@ discard block |
||
| 2540 | 2540 | function performDBQuery(array $SETTINGS, string $fields, string $table): array |
| 2541 | 2541 | { |
| 2542 | 2542 | // include librairies & connect to DB |
| 2543 | - include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 2544 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 2543 | + include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 2544 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 2545 | 2545 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 2546 | 2546 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 2547 | 2547 | } |
@@ -2555,7 +2555,7 @@ discard block |
||
| 2555 | 2555 | DB::$connect_options = DB_CONNECT_OPTIONS; |
| 2556 | 2556 | // Insert log in DB |
| 2557 | 2557 | return DB::query( |
| 2558 | - 'SELECT ' . $fields . ' |
|
| 2558 | + 'SELECT '.$fields.' |
|
| 2559 | 2559 | FROM ' . prefixTable($table) |
| 2560 | 2560 | ); |
| 2561 | 2561 | } |
@@ -2570,11 +2570,11 @@ discard block |
||
| 2570 | 2570 | function formatSizeUnits(int $bytes): string |
| 2571 | 2571 | { |
| 2572 | 2572 | if ($bytes >= 1073741824) { |
| 2573 | - $bytes = number_format($bytes / 1073741824, 2) . ' GB'; |
|
| 2573 | + $bytes = number_format($bytes / 1073741824, 2).' GB'; |
|
| 2574 | 2574 | } elseif ($bytes >= 1048576) { |
| 2575 | - $bytes = number_format($bytes / 1048576, 2) . ' MB'; |
|
| 2575 | + $bytes = number_format($bytes / 1048576, 2).' MB'; |
|
| 2576 | 2576 | } elseif ($bytes >= 1024) { |
| 2577 | - $bytes = number_format($bytes / 1024, 2) . ' KB'; |
|
| 2577 | + $bytes = number_format($bytes / 1024, 2).' KB'; |
|
| 2578 | 2578 | } elseif ($bytes > 1) { |
| 2579 | 2579 | $bytes .= ' bytes'; |
| 2580 | 2580 | } elseif ($bytes === 1) { |
@@ -2783,14 +2783,14 @@ discard block |
||
| 2783 | 2783 | |
| 2784 | 2784 | // Encrypt the file content |
| 2785 | 2785 | $plaintext = file_get_contents( |
| 2786 | - filter_var($fileInPath . '/' . $fileInName, FILTER_SANITIZE_URL) |
|
| 2786 | + filter_var($fileInPath.'/'.$fileInName, FILTER_SANITIZE_URL) |
|
| 2787 | 2787 | ); |
| 2788 | 2788 | $ciphertext = $cipher->encrypt($plaintext); |
| 2789 | 2789 | // Save new file |
| 2790 | 2790 | $hash = md5($plaintext); |
| 2791 | - $fileOut = $fileInPath . '/' . TP_FILE_PREFIX . $hash; |
|
| 2791 | + $fileOut = $fileInPath.'/'.TP_FILE_PREFIX.$hash; |
|
| 2792 | 2792 | file_put_contents($fileOut, $ciphertext); |
| 2793 | - unlink($fileInPath . '/' . $fileInName); |
|
| 2793 | + unlink($fileInPath.'/'.$fileInName); |
|
| 2794 | 2794 | return [ |
| 2795 | 2795 | 'fileHash' => base64_encode($hash), |
| 2796 | 2796 | 'objectKey' => base64_encode($objectKey), |
@@ -2808,7 +2808,7 @@ discard block |
||
| 2808 | 2808 | */ |
| 2809 | 2809 | function decryptFile(string $fileName, string $filePath, string $key): string |
| 2810 | 2810 | { |
| 2811 | - if (! defined('FILE_BUFFER_SIZE')) { |
|
| 2811 | + if (!defined('FILE_BUFFER_SIZE')) { |
|
| 2812 | 2812 | define('FILE_BUFFER_SIZE', 128 * 1024); |
| 2813 | 2813 | } |
| 2814 | 2814 | |
@@ -2827,7 +2827,7 @@ discard block |
||
| 2827 | 2827 | $cipher->enableContinuousBuffer(); |
| 2828 | 2828 | $cipher->disablePadding(); |
| 2829 | 2829 | // Get file content |
| 2830 | - $ciphertext = file_get_contents($filePath . '/' . TP_FILE_PREFIX . $fileName); |
|
| 2830 | + $ciphertext = file_get_contents($filePath.'/'.TP_FILE_PREFIX.$fileName); |
|
| 2831 | 2831 | // Decrypt file content and return |
| 2832 | 2832 | return base64_encode($cipher->decrypt($ciphertext)); |
| 2833 | 2833 | } |
@@ -2881,8 +2881,8 @@ discard block |
||
| 2881 | 2881 | array $SETTINGS |
| 2882 | 2882 | ): void { |
| 2883 | 2883 | // include librairies & connect to DB |
| 2884 | - include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 2885 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 2884 | + include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 2885 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 2886 | 2886 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 2887 | 2887 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 2888 | 2888 | } |
@@ -2901,7 +2901,7 @@ discard block |
||
| 2901 | 2901 | $post_object_id |
| 2902 | 2902 | ); |
| 2903 | 2903 | // Superglobals |
| 2904 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 2904 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 2905 | 2905 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 2906 | 2906 | // Prepare superGlobal variables |
| 2907 | 2907 | $sessionPpersonaFolders = $superGlobal->get('personal_folders', 'SESSION'); |
@@ -2926,8 +2926,8 @@ discard block |
||
| 2926 | 2926 | // Create sharekey for each user |
| 2927 | 2927 | $users = DB::query( |
| 2928 | 2928 | 'SELECT id, public_key |
| 2929 | - FROM ' . prefixTable('users') . ' |
|
| 2930 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '") |
|
| 2929 | + FROM ' . prefixTable('users').' |
|
| 2930 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'") |
|
| 2931 | 2931 | AND public_key != ""' |
| 2932 | 2932 | ); |
| 2933 | 2933 | foreach ($users as $user) { |
@@ -2957,7 +2957,7 @@ discard block |
||
| 2957 | 2957 | function isBase64(string $str): bool |
| 2958 | 2958 | { |
| 2959 | 2959 | $str = (string) trim($str); |
| 2960 | - if (! isset($str[0])) { |
|
| 2960 | + if (!isset($str[0])) { |
|
| 2961 | 2961 | return false; |
| 2962 | 2962 | } |
| 2963 | 2963 | |
@@ -3025,12 +3025,12 @@ discard block |
||
| 3025 | 3025 | ], |
| 3026 | 3026 | ]; |
| 3027 | 3027 | // Load expected libraries |
| 3028 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php'; |
|
| 3029 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php'; |
|
| 3030 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php'; |
|
| 3031 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php'; |
|
| 3032 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php'; |
|
| 3033 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php'; |
|
| 3028 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php'; |
|
| 3029 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php'; |
|
| 3030 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php'; |
|
| 3031 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php'; |
|
| 3032 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php'; |
|
| 3033 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php'; |
|
| 3034 | 3034 | $ad = new SplClassLoader('LdapRecord', '../includes/libraries'); |
| 3035 | 3035 | $ad->register(); |
| 3036 | 3036 | $connection = new Connection($config); |
@@ -3039,7 +3039,7 @@ discard block |
||
| 3039 | 3039 | $connection->connect(); |
| 3040 | 3040 | } catch (\LdapRecord\Auth\BindException $e) { |
| 3041 | 3041 | $error = $e->getDetailedError(); |
| 3042 | - echo 'Error : '.$error->getErrorCode().' - '.$error->getErrorMessage(). '<br>'.$error->getDiagnosticMessage(); |
|
| 3042 | + echo 'Error : '.$error->getErrorCode().' - '.$error->getErrorMessage().'<br>'.$error->getDiagnosticMessage(); |
|
| 3043 | 3043 | return false; |
| 3044 | 3044 | } |
| 3045 | 3045 | |
@@ -3052,7 +3052,7 @@ discard block |
||
| 3052 | 3052 | } |
| 3053 | 3053 | } catch (\LdapRecord\Auth\BindException $e) { |
| 3054 | 3054 | $error = $e->getDetailedError(); |
| 3055 | - echo 'Error : '.$error->getErrorCode().' - '.$error->getErrorMessage(). '<br>'.$error->getDiagnosticMessage(); |
|
| 3055 | + echo 'Error : '.$error->getErrorCode().' - '.$error->getErrorMessage().'<br>'.$error->getDiagnosticMessage(); |
|
| 3056 | 3056 | return false; |
| 3057 | 3057 | } |
| 3058 | 3058 | |
@@ -3070,8 +3070,8 @@ discard block |
||
| 3070 | 3070 | function deleteUserObjetsKeys(int $userId, array $SETTINGS): bool |
| 3071 | 3071 | { |
| 3072 | 3072 | // include librairies & connect to DB |
| 3073 | - include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 3074 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 3073 | + include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 3074 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 3075 | 3075 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 3076 | 3076 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 3077 | 3077 | } |
@@ -3131,7 +3131,7 @@ discard block |
||
| 3131 | 3131 | foreach (DateTimeZone::listIdentifiers() as $timezone) { |
| 3132 | 3132 | $now->setTimezone(new DateTimeZone($timezone)); |
| 3133 | 3133 | $offsets[] = $offset = $now->getOffset(); |
| 3134 | - $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone); |
|
| 3134 | + $timezones[$timezone] = '('.format_GMT_offset($offset).') '.format_timezone_name($timezone); |
|
| 3135 | 3135 | } |
| 3136 | 3136 | |
| 3137 | 3137 | array_multisort($offsets, $timezones); |
@@ -3151,7 +3151,7 @@ discard block |
||
| 3151 | 3151 | { |
| 3152 | 3152 | $hours = intval($offset / 3600); |
| 3153 | 3153 | $minutes = abs(intval($offset % 3600 / 60)); |
| 3154 | - return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
| 3154 | + return 'GMT'.($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
| 3155 | 3155 | } |
| 3156 | 3156 | |
| 3157 | 3157 | /** |
@@ -3254,8 +3254,7 @@ discard block |
||
| 3254 | 3254 | { |
| 3255 | 3255 | if (isset($array[$key]) === true |
| 3256 | 3256 | && (is_int($value) === true ? |
| 3257 | - (int) $array[$key] === $value : |
|
| 3258 | - (string) $array[$key] === $value) |
|
| 3257 | + (int) $array[$key] === $value : (string) $array[$key] === $value) |
|
| 3259 | 3258 | ) { |
| 3260 | 3259 | return true; |
| 3261 | 3260 | } |
@@ -3277,8 +3276,7 @@ discard block |
||
| 3277 | 3276 | { |
| 3278 | 3277 | if (isset($var) === false |
| 3279 | 3278 | || (is_int($value) === true ? |
| 3280 | - (int) $var === $value : |
|
| 3281 | - (string) $var === $value) |
|
| 3279 | + (int) $var === $value : (string) $var === $value) |
|
| 3282 | 3280 | ) { |
| 3283 | 3281 | return true; |
| 3284 | 3282 | } |
@@ -3329,7 +3327,7 @@ discard block |
||
| 3329 | 3327 | */ |
| 3330 | 3328 | function isSetArrayOfValues(array $arrayOfValues): bool |
| 3331 | 3329 | { |
| 3332 | - foreach($arrayOfValues as $value) { |
|
| 3330 | + foreach ($arrayOfValues as $value) { |
|
| 3333 | 3331 | if (isset($value) === false) { |
| 3334 | 3332 | return false; |
| 3335 | 3333 | } |
@@ -3351,7 +3349,7 @@ discard block |
||
| 3351 | 3349 | /*PHP8 - integer|string*/$value |
| 3352 | 3350 | ) : bool |
| 3353 | 3351 | { |
| 3354 | - foreach($arrayOfVars as $variable) { |
|
| 3352 | + foreach ($arrayOfVars as $variable) { |
|
| 3355 | 3353 | if ($variable !== $value) { |
| 3356 | 3354 | return false; |
| 3357 | 3355 | } |
@@ -3371,7 +3369,7 @@ discard block |
||
| 3371 | 3369 | /*PHP8 - integer|string*/$value |
| 3372 | 3370 | ) : bool |
| 3373 | 3371 | { |
| 3374 | - foreach($arrayOfVars as $variable) { |
|
| 3372 | + foreach ($arrayOfVars as $variable) { |
|
| 3375 | 3373 | if ($variable === $value) { |
| 3376 | 3374 | return true; |
| 3377 | 3375 | } |
@@ -3444,16 +3442,16 @@ discard block |
||
| 3444 | 3442 | ): array |
| 3445 | 3443 | { |
| 3446 | 3444 | // Load Sanitizer library |
| 3447 | - require_once $path . '/includes/libraries/Illuminate/Support/Traits/Macroable.php'; |
|
| 3448 | - require_once $path . '/includes/libraries/Illuminate/Support/Str.php'; |
|
| 3449 | - require_once $path . '/includes/libraries/Illuminate/Validation/ValidationRuleParser.php'; |
|
| 3450 | - require_once $path . '/includes/libraries/Illuminate/Support/Arr.php'; |
|
| 3451 | - require_once $path . '/includes/libraries/Elegant/sanitizer/Contracts/Filter.php'; |
|
| 3452 | - require_once $path . '/includes/libraries/Elegant/sanitizer/Filters/Trim.php'; |
|
| 3453 | - require_once $path . '/includes/libraries/Elegant/sanitizer/Filters/Cast.php'; |
|
| 3454 | - require_once $path . '/includes/libraries/Elegant/sanitizer/Filters/EscapeHTML.php'; |
|
| 3455 | - require_once $path . '/includes/libraries/Elegant/sanitizer/Filters/EmptyStringToNull.php'; |
|
| 3456 | - require_once $path . '/includes/libraries/Elegant/sanitizer/Sanitizer.php'; |
|
| 3445 | + require_once $path.'/includes/libraries/Illuminate/Support/Traits/Macroable.php'; |
|
| 3446 | + require_once $path.'/includes/libraries/Illuminate/Support/Str.php'; |
|
| 3447 | + require_once $path.'/includes/libraries/Illuminate/Validation/ValidationRuleParser.php'; |
|
| 3448 | + require_once $path.'/includes/libraries/Illuminate/Support/Arr.php'; |
|
| 3449 | + require_once $path.'/includes/libraries/Elegant/sanitizer/Contracts/Filter.php'; |
|
| 3450 | + require_once $path.'/includes/libraries/Elegant/sanitizer/Filters/Trim.php'; |
|
| 3451 | + require_once $path.'/includes/libraries/Elegant/sanitizer/Filters/Cast.php'; |
|
| 3452 | + require_once $path.'/includes/libraries/Elegant/sanitizer/Filters/EscapeHTML.php'; |
|
| 3453 | + require_once $path.'/includes/libraries/Elegant/sanitizer/Filters/EmptyStringToNull.php'; |
|
| 3454 | + require_once $path.'/includes/libraries/Elegant/sanitizer/Sanitizer.php'; |
|
| 3457 | 3455 | |
| 3458 | 3456 | // Sanitize post and get variables |
| 3459 | 3457 | $sanitizer = new Elegant\sanitizer\Sanitizer($data, $filters); |
@@ -3471,9 +3469,9 @@ discard block |
||
| 3471 | 3469 | */ |
| 3472 | 3470 | function cacheTreeUserHandler(int $user_id, string $data, array $SETTINGS, string $field_update = '') |
| 3473 | 3471 | { |
| 3474 | - include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 3472 | + include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 3475 | 3473 | //Connect to DB |
| 3476 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 3474 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 3477 | 3475 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 3478 | 3476 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 3479 | 3477 | } |
@@ -3489,7 +3487,7 @@ discard block |
||
| 3489 | 3487 | // Exists ? |
| 3490 | 3488 | $userCacheId = DB::queryfirstrow( |
| 3491 | 3489 | 'SELECT increment_id |
| 3492 | - FROM ' . prefixTable('cache_tree') . ' |
|
| 3490 | + FROM ' . prefixTable('cache_tree').' |
|
| 3493 | 3491 | WHERE user_id = %i', |
| 3494 | 3492 | $user_id |
| 3495 | 3493 | ); |
@@ -3537,7 +3535,7 @@ discard block |
||
| 3537 | 3535 | */ |
| 3538 | 3536 | function pourcentage(float $nombre, float $total, float $pourcentage): float |
| 3539 | 3537 | { |
| 3540 | - $resultat = ($nombre/$total) * $pourcentage; |
|
| 3538 | + $resultat = ($nombre / $total) * $pourcentage; |
|
| 3541 | 3539 | return round($resultat); |
| 3542 | 3540 | } |
| 3543 | 3541 | |
@@ -3565,7 +3563,7 @@ discard block |
||
| 3565 | 3563 | |
| 3566 | 3564 | // Get last folder update |
| 3567 | 3565 | $lastFolderChange = DB::queryfirstrow( |
| 3568 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' |
|
| 3566 | + 'SELECT valeur FROM '.prefixTable('misc').' |
|
| 3569 | 3567 | WHERE type = %s AND intitule = %s', |
| 3570 | 3568 | 'timestamp', |
| 3571 | 3569 | 'last_folder_change' |
@@ -3595,7 +3593,7 @@ discard block |
||
| 3595 | 3593 | // Does this user has a tree cache |
| 3596 | 3594 | $userCacheTree = DB::queryfirstrow( |
| 3597 | 3595 | 'SELECT '.$fieldName.' |
| 3598 | - FROM ' . prefixTable('cache_tree') . ' |
|
| 3596 | + FROM ' . prefixTable('cache_tree').' |
|
| 3599 | 3597 | WHERE user_id = %i', |
| 3600 | 3598 | $_SESSION['user_id'] |
| 3601 | 3599 | ); |
@@ -3624,12 +3622,12 @@ discard block |
||
| 3624 | 3622 | ) |
| 3625 | 3623 | { |
| 3626 | 3624 | //load ClassLoader |
| 3627 | - include_once __DIR__. '/../sources/SplClassLoader.php'; |
|
| 3625 | + include_once __DIR__.'/../sources/SplClassLoader.php'; |
|
| 3628 | 3626 | // Load superglobal |
| 3629 | - include_once __DIR__. '/../includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 3627 | + include_once __DIR__.'/../includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 3630 | 3628 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 3631 | 3629 | //Connect to DB |
| 3632 | - include_once __DIR__. '/../includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 3630 | + include_once __DIR__.'/../includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 3633 | 3631 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 3634 | 3632 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 3635 | 3633 | } |
@@ -3648,7 +3646,7 @@ discard block |
||
| 3648 | 3646 | if (count($folderIds) === 0) { |
| 3649 | 3647 | $folderIds = DB::queryFirstColumn( |
| 3650 | 3648 | 'SELECT id |
| 3651 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3649 | + FROM ' . prefixTable('nested_tree').' |
|
| 3652 | 3650 | WHERE personal_folder=%i', |
| 3653 | 3651 | 0 |
| 3654 | 3652 | ); |
@@ -3665,8 +3663,8 @@ discard block |
||
| 3665 | 3663 | $rows_tmp = DB::query( |
| 3666 | 3664 | 'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory, |
| 3667 | 3665 | f.id_category AS category_id |
| 3668 | - FROM ' . prefixTable('categories_folders') . ' AS f |
|
| 3669 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id) |
|
| 3666 | + FROM ' . prefixTable('categories_folders').' AS f |
|
| 3667 | + INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id) |
|
| 3670 | 3668 | WHERE id_folder=%i', |
| 3671 | 3669 | $folder |
| 3672 | 3670 | ); |
@@ -3692,7 +3690,7 @@ discard block |
||
| 3692 | 3690 | $valTemp = ''; |
| 3693 | 3691 | $data = DB::queryFirstRow( |
| 3694 | 3692 | 'SELECT valeur |
| 3695 | - FROM ' . prefixTable('misc') . ' |
|
| 3693 | + FROM ' . prefixTable('misc').' |
|
| 3696 | 3694 | WHERE type = %s AND intitule=%i', |
| 3697 | 3695 | 'complex', |
| 3698 | 3696 | $folder |
@@ -3709,14 +3707,14 @@ discard block |
||
| 3709 | 3707 | $valTemp = ''; |
| 3710 | 3708 | $rows_tmp = DB::query( |
| 3711 | 3709 | 'SELECT t.title |
| 3712 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 3713 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 3710 | + FROM ' . prefixTable('roles_values').' as v |
|
| 3711 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 3714 | 3712 | WHERE v.folder_id = %i |
| 3715 | 3713 | GROUP BY title', |
| 3716 | 3714 | $folder |
| 3717 | 3715 | ); |
| 3718 | 3716 | foreach ($rows_tmp as $record) { |
| 3719 | - $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title']; |
|
| 3717 | + $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title']; |
|
| 3720 | 3718 | } |
| 3721 | 3719 | $arr_data['visibilityRoles'] = $valTemp; |
| 3722 | 3720 | |
