nilsteampassnet /
TeamPass
@@ -34,12 +34,12 @@ discard block |
||
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | // Do checks |
| 37 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 38 | -require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php'; |
|
| 37 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 38 | +require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
|
| 39 | 39 | if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'items', $SETTINGS) === false) { |
| 40 | 40 | // Not allowed page |
| 41 | 41 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 42 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 42 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 43 | 43 | exit(); |
| 44 | 44 | } |
| 45 | 45 | |
@@ -52,8 +52,8 @@ discard block |
||
| 52 | 52 | date_default_timezone_set('UTC'); |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php'; |
|
| 56 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 55 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php'; |
|
| 56 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 57 | 57 | header('Content-type: text/html; charset=utf-8'); |
| 58 | 58 | header('Cache-Control: no-cache, must-revalidate'); |
| 59 | 59 | require_once 'main.functions.php'; |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | // Connect to mysql server |
| 78 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 78 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 79 | 79 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 80 | 80 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 81 | 81 | } |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | DB::$encoding = DB_ENCODING; |
| 88 | 88 | |
| 89 | 89 | // Class loader |
| 90 | -require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 90 | +require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 91 | 91 | |
| 92 | 92 | //Load Tree |
| 93 | 93 | $tree = new SplClassLoader('Tree\NestedTree', '../includes/libraries'); |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | // About special settings |
| 303 | 303 | $dataFolderSettings = DB::queryFirstRow( |
| 304 | 304 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 305 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 305 | + FROM ' . prefixTable('nested_tree').' |
|
| 306 | 306 | WHERE id = %i', |
| 307 | 307 | $post_folder_id |
| 308 | 308 | ); |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | // Get folder complexity |
| 318 | 318 | $folderComplexity = DB::queryfirstrow( |
| 319 | 319 | 'SELECT valeur |
| 320 | - FROM ' . prefixTable('misc') . ' |
|
| 320 | + FROM ' . prefixTable('misc').' |
|
| 321 | 321 | WHERE type = %s AND intitule = %i', |
| 322 | 322 | 'complex', |
| 323 | 323 | $post_folder_id |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | $itemExists = 0; |
| 343 | 343 | $newID = ''; |
| 344 | 344 | $data = DB::queryfirstrow( |
| 345 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 345 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 346 | 346 | WHERE label = %s AND inactif = %i', |
| 347 | 347 | $post_label, |
| 348 | 348 | 0 |
@@ -468,7 +468,7 @@ discard block |
||
| 468 | 468 | // should we encrypt the data |
| 469 | 469 | $dataTmp = DB::queryFirstRow( |
| 470 | 470 | 'SELECT encrypted_data |
| 471 | - FROM ' . prefixTable('categories') . ' |
|
| 471 | + FROM ' . prefixTable('categories').' |
|
| 472 | 472 | WHERE id = %i', |
| 473 | 473 | $field_data[0] |
| 474 | 474 | ); |
@@ -524,7 +524,7 @@ discard block |
||
| 524 | 524 | ) { |
| 525 | 525 | DB::queryFirstRow( |
| 526 | 526 | 'SELECT * |
| 527 | - FROM ' . prefixTable('templates') . ' |
|
| 527 | + FROM ' . prefixTable('templates').' |
|
| 528 | 528 | WHERE item_id = %i', |
| 529 | 529 | $newID |
| 530 | 530 | ); |
@@ -593,11 +593,11 @@ discard block |
||
| 593 | 593 | ) { |
| 594 | 594 | foreach ($post_restricted_to as $userRest) { |
| 595 | 595 | if (empty($userRest) === false) { |
| 596 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest); |
|
| 596 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest); |
|
| 597 | 597 | if (empty($listOfRestricted)) { |
| 598 | 598 | $listOfRestricted = $dataTmp['login']; |
| 599 | 599 | } else { |
| 600 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 600 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 601 | 601 | } |
| 602 | 602 | } |
| 603 | 603 | } |
@@ -610,11 +610,11 @@ discard block |
||
| 610 | 610 | if (empty($data['restricted_to']) === false) { |
| 611 | 611 | foreach (explode(';', $data['restricted_to']) as $userRest) { |
| 612 | 612 | if (empty($userRest) === false) { |
| 613 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
| 613 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
| 614 | 614 | if (empty($oldRestrictionList) === true) { |
| 615 | 615 | $oldRestrictionList = $dataTmp['login']; |
| 616 | 616 | } else { |
| 617 | - $oldRestrictionList .= ';' . $dataTmp['login']; |
|
| 617 | + $oldRestrictionList .= ';'.$dataTmp['login']; |
|
| 618 | 618 | } |
| 619 | 619 | } |
| 620 | 620 | } |
@@ -677,7 +677,7 @@ discard block |
||
| 677 | 677 | if (empty($post_uploaded_file_id) === false) { |
| 678 | 678 | $rows = DB::query( |
| 679 | 679 | 'SELECT id |
| 680 | - FROM ' . prefixTable('files') . ' |
|
| 680 | + FROM ' . prefixTable('files').' |
|
| 681 | 681 | WHERE id_item = %s', |
| 682 | 682 | $post_uploaded_file_id |
| 683 | 683 | ); |
@@ -717,14 +717,14 @@ discard block |
||
| 717 | 717 | langHdl('email_subject'), |
| 718 | 718 | str_replace( |
| 719 | 719 | array('#label', '#link'), |
| 720 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $post_folder_id . '&id=' . $newID . $txt['email_body3']), |
|
| 720 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$post_folder_id.'&id='.$newID.$txt['email_body3']), |
|
| 721 | 721 | langHdl('new_item_email_body') |
| 722 | 722 | ), |
| 723 | 723 | $emailAddress, |
| 724 | 724 | $SETTINGS, |
| 725 | 725 | str_replace( |
| 726 | 726 | array('#label', '#link'), |
| 727 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $post_folder_id . '&id=' . $newID . $txt['email_body3']), |
|
| 727 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$post_folder_id.'&id='.$newID.$txt['email_body3']), |
|
| 728 | 728 | langHdl('new_item_email_body') |
| 729 | 729 | ) |
| 730 | 730 | ); |
@@ -889,7 +889,7 @@ discard block |
||
| 889 | 889 | // About special settings |
| 890 | 890 | $dataFolderSettings = DB::queryFirstRow( |
| 891 | 891 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 892 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 892 | + FROM ' . prefixTable('nested_tree').' |
|
| 893 | 893 | WHERE id = %i', |
| 894 | 894 | $post_folder_id |
| 895 | 895 | ); |
@@ -904,7 +904,7 @@ discard block |
||
| 904 | 904 | // Get folder complexity |
| 905 | 905 | $folderComplexity = DB::queryfirstrow( |
| 906 | 906 | 'SELECT valeur |
| 907 | - FROM ' . prefixTable('misc') . ' |
|
| 907 | + FROM ' . prefixTable('misc').' |
|
| 908 | 908 | WHERE type = %s AND intitule = %i', |
| 909 | 909 | 'complex', |
| 910 | 910 | $post_folder_id |
@@ -943,8 +943,8 @@ discard block |
||
| 943 | 943 | // Get all informations for this item |
| 944 | 944 | $dataItem = DB::queryfirstrow( |
| 945 | 945 | 'SELECT * |
| 946 | - FROM ' . prefixTable('items') . ' as i |
|
| 947 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 946 | + FROM ' . prefixTable('items').' as i |
|
| 947 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 948 | 948 | WHERE i.id=%i AND l.action = %s', |
| 949 | 949 | $post_item_id, |
| 950 | 950 | 'at_creation' |
@@ -954,7 +954,7 @@ discard block |
||
| 954 | 954 | //db::debugmode(true); |
| 955 | 955 | DB::query( |
| 956 | 956 | 'SELECT * |
| 957 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 957 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 958 | 958 | WHERE object_id = %i AND user_id = %s', |
| 959 | 959 | $post_item_id, |
| 960 | 960 | $_SESSION['user_id'] |
@@ -1004,9 +1004,9 @@ discard block |
||
| 1004 | 1004 | '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, |
| 1005 | 1005 | 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, |
| 1006 | 1006 | u.login as user_login, u.email as user_email |
| 1007 | - FROM ' . prefixTable('items') . ' as i |
|
| 1008 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item) |
|
| 1009 | - INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user) |
|
| 1007 | + FROM ' . prefixTable('items').' as i |
|
| 1008 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item) |
|
| 1009 | + INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user) |
|
| 1010 | 1010 | WHERE i.id=%i', |
| 1011 | 1011 | $post_item_id |
| 1012 | 1012 | ); |
@@ -1014,7 +1014,7 @@ discard block |
||
| 1014 | 1014 | // Should we log a password change? |
| 1015 | 1015 | $userKey = DB::queryFirstRow( |
| 1016 | 1016 | 'SELECT share_key |
| 1017 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1017 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1018 | 1018 | WHERE user_id = %i AND object_id = %i', |
| 1019 | 1019 | $_SESSION['user_id'], |
| 1020 | 1020 | $post_item_id |
@@ -1126,8 +1126,8 @@ discard block |
||
| 1126 | 1126 | 'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv, |
| 1127 | 1127 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, |
| 1128 | 1128 | c.masked AS masked, i.id AS field_item_id |
| 1129 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 1130 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 1129 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 1130 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 1131 | 1131 | WHERE i.field_id = %i AND i.item_id = %i', |
| 1132 | 1132 | $field['id'], |
| 1133 | 1133 | $post_item_id |
@@ -1141,7 +1141,7 @@ discard block |
||
| 1141 | 1141 | // Perform new query |
| 1142 | 1142 | $dataTmpCat = DB::queryFirstRow( |
| 1143 | 1143 | 'SELECT id, title, encrypted_data, masked |
| 1144 | - FROM ' . prefixTable('categories') . ' |
|
| 1144 | + FROM ' . prefixTable('categories').' |
|
| 1145 | 1145 | WHERE id = %i', |
| 1146 | 1146 | $field['id'] |
| 1147 | 1147 | ); |
@@ -1213,7 +1213,7 @@ discard block |
||
| 1213 | 1213 | $_SESSION['user_id'], |
| 1214 | 1214 | 'at_modification', |
| 1215 | 1215 | $_SESSION['login'], |
| 1216 | - 'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value'] |
|
| 1216 | + 'at_field : '.$dataTmpCat['title'].' : '.$field['value'] |
|
| 1217 | 1217 | ); |
| 1218 | 1218 | } else { |
| 1219 | 1219 | // compare the old and new value |
@@ -1221,7 +1221,7 @@ discard block |
||
| 1221 | 1221 | // Get user sharekey for this field |
| 1222 | 1222 | $userKey = DB::queryFirstRow( |
| 1223 | 1223 | 'SELECT share_key |
| 1224 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 1224 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 1225 | 1225 | WHERE user_id = %i AND object_id = %i', |
| 1226 | 1226 | $_SESSION['user_id'], |
| 1227 | 1227 | $dataTmpCat['field_item_id'] |
@@ -1290,7 +1290,7 @@ discard block |
||
| 1290 | 1290 | $_SESSION['user_id'], |
| 1291 | 1291 | 'at_modification', |
| 1292 | 1292 | $_SESSION['login'], |
| 1293 | - 'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal |
|
| 1293 | + 'at_field : '.$dataTmpCat['title'].' => '.$oldVal |
|
| 1294 | 1294 | ); |
| 1295 | 1295 | } |
| 1296 | 1296 | } |
@@ -1315,7 +1315,7 @@ discard block |
||
| 1315 | 1315 | ) { |
| 1316 | 1316 | DB::queryFirstRow( |
| 1317 | 1317 | 'SELECT * |
| 1318 | - FROM ' . prefixTable('templates') . ' |
|
| 1318 | + FROM ' . prefixTable('templates').' |
|
| 1319 | 1319 | WHERE item_id = %i', |
| 1320 | 1320 | $post_item_id |
| 1321 | 1321 | ); |
@@ -1358,7 +1358,7 @@ discard block |
||
| 1358 | 1358 | // check if elem exists in Table. If not add it or update it. |
| 1359 | 1359 | DB::query( |
| 1360 | 1360 | 'SELECT * |
| 1361 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 1361 | + FROM ' . prefixTable('automatic_del').' |
|
| 1362 | 1362 | WHERE item_id = %i', |
| 1363 | 1363 | $post_item_id |
| 1364 | 1364 | ); |
@@ -1385,7 +1385,7 @@ discard block |
||
| 1385 | 1385 | // Store updates performed |
| 1386 | 1386 | array_push( |
| 1387 | 1387 | $arrayOfChanges, |
| 1388 | - langHdl('automatic_deletion_engaged') . ': ' . langHdl('enabled') |
|
| 1388 | + langHdl('automatic_deletion_engaged').': '.langHdl('enabled') |
|
| 1389 | 1389 | ); |
| 1390 | 1390 | |
| 1391 | 1391 | // update LOG |
@@ -1428,7 +1428,7 @@ discard block |
||
| 1428 | 1428 | // Store updates performed |
| 1429 | 1429 | array_push( |
| 1430 | 1430 | $arrayOfChanges, |
| 1431 | - langHdl('automatic_deletion_engaged') . ': ' . langHdl('disabled') |
|
| 1431 | + langHdl('automatic_deletion_engaged').': '.langHdl('disabled') |
|
| 1432 | 1432 | ); |
| 1433 | 1433 | |
| 1434 | 1434 | // update LOG |
@@ -1461,7 +1461,7 @@ discard block |
||
| 1461 | 1461 | if (empty($userId) === false) { |
| 1462 | 1462 | $dataTmp = DB::queryfirstrow( |
| 1463 | 1463 | 'SELECT id, name, lastname |
| 1464 | - FROM ' . prefixTable('users') . ' |
|
| 1464 | + FROM ' . prefixTable('users').' |
|
| 1465 | 1465 | WHERE id= %i', |
| 1466 | 1466 | $userId |
| 1467 | 1467 | ); |
@@ -1469,7 +1469,7 @@ discard block |
||
| 1469 | 1469 | // Add to array |
| 1470 | 1470 | array_push( |
| 1471 | 1471 | $arrayOfUsersRestriction, |
| 1472 | - $dataTmp['name'] . ' ' . $dataTmp['lastname'] |
|
| 1472 | + $dataTmp['name'].' '.$dataTmp['lastname'] |
|
| 1473 | 1473 | ); |
| 1474 | 1474 | array_push( |
| 1475 | 1475 | $arrayOfUsersIdRestriction, |
@@ -1500,8 +1500,8 @@ discard block |
||
| 1500 | 1500 | // get values before deleting them |
| 1501 | 1501 | $rows = DB::query( |
| 1502 | 1502 | 'SELECT t.title, t.id AS id |
| 1503 | - FROM ' . prefixTable('roles_title') . ' as t |
|
| 1504 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id) |
|
| 1503 | + FROM ' . prefixTable('roles_title').' as t |
|
| 1504 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id) |
|
| 1505 | 1505 | WHERE r.item_id = %i |
| 1506 | 1506 | ORDER BY t.title ASC', |
| 1507 | 1507 | $post_item_id |
@@ -1535,7 +1535,7 @@ discard block |
||
| 1535 | 1535 | ); |
| 1536 | 1536 | $dataTmp = DB::queryfirstrow( |
| 1537 | 1537 | 'SELECT title |
| 1538 | - FROM ' . prefixTable('roles_title') . ' |
|
| 1538 | + FROM ' . prefixTable('roles_title').' |
|
| 1539 | 1539 | WHERE id = %i', |
| 1540 | 1540 | $role |
| 1541 | 1541 | ); |
@@ -1576,8 +1576,8 @@ discard block |
||
| 1576 | 1576 | $_SESSION['user_id'], |
| 1577 | 1577 | 'at_modification', |
| 1578 | 1578 | $_SESSION['login'], |
| 1579 | - 'at_restriction : ' . (count($diffUsersRestiction) > 0 ? |
|
| 1580 | - implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1579 | + 'at_restriction : '.(count($diffUsersRestiction) > 0 ? |
|
| 1580 | + implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1581 | 1581 | ); |
| 1582 | 1582 | } |
| 1583 | 1583 | |
@@ -1597,7 +1597,7 @@ discard block |
||
| 1597 | 1597 | $_SESSION['user_id'], |
| 1598 | 1598 | 'at_modification', |
| 1599 | 1599 | $_SESSION['login'], |
| 1600 | - 'at_label : ' . $data['label'] . ' => ' . $post_label |
|
| 1600 | + 'at_label : '.$data['label'].' => '.$post_label |
|
| 1601 | 1601 | ); |
| 1602 | 1602 | } |
| 1603 | 1603 | // LOGIN |
@@ -1616,7 +1616,7 @@ discard block |
||
| 1616 | 1616 | $_SESSION['user_id'], |
| 1617 | 1617 | 'at_modification', |
| 1618 | 1618 | $_SESSION['login'], |
| 1619 | - 'at_login : ' . $data['login'] . ' => ' . $post_login |
|
| 1619 | + 'at_login : '.$data['login'].' => '.$post_login |
|
| 1620 | 1620 | ); |
| 1621 | 1621 | } |
| 1622 | 1622 | |
@@ -1635,7 +1635,7 @@ discard block |
||
| 1635 | 1635 | $_SESSION['user_id'], |
| 1636 | 1636 | 'at_modification', |
| 1637 | 1637 | $_SESSION['login'], |
| 1638 | - 'at_email : ' . $data['email'] . ' => ' . $post_email |
|
| 1638 | + 'at_email : '.$data['email'].' => '.$post_email |
|
| 1639 | 1639 | ); |
| 1640 | 1640 | } |
| 1641 | 1641 | // URL |
@@ -1654,7 +1654,7 @@ discard block |
||
| 1654 | 1654 | $_SESSION['user_id'], |
| 1655 | 1655 | 'at_modification', |
| 1656 | 1656 | $_SESSION['login'], |
| 1657 | - 'at_url : ' . $data['url'] . ' => ' . $post_url |
|
| 1657 | + 'at_url : '.$data['url'].' => '.$post_url |
|
| 1658 | 1658 | ); |
| 1659 | 1659 | } |
| 1660 | 1660 | // DESCRIPTION |
@@ -1679,7 +1679,7 @@ discard block |
||
| 1679 | 1679 | // FOLDER |
| 1680 | 1680 | if ($data['id_tree'] !== $post_folder_id) { |
| 1681 | 1681 | // Get name of folders |
| 1682 | - $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $post_folder_id)); |
|
| 1682 | + $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $post_folder_id)); |
|
| 1683 | 1683 | |
| 1684 | 1684 | // Store updates performed |
| 1685 | 1685 | array_push( |
@@ -1695,7 +1695,7 @@ discard block |
||
| 1695 | 1695 | $_SESSION['user_id'], |
| 1696 | 1696 | 'at_modification', |
| 1697 | 1697 | $_SESSION['login'], |
| 1698 | - 'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title'] |
|
| 1698 | + 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title'] |
|
| 1699 | 1699 | ); |
| 1700 | 1700 | // ask for page reloading |
| 1701 | 1701 | $reloadPage = true; |
@@ -1705,7 +1705,7 @@ discard block |
||
| 1705 | 1705 | // Store updates performed |
| 1706 | 1706 | array_push( |
| 1707 | 1707 | $arrayOfChanges, |
| 1708 | - langHdl('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? langHdl('disabled') : langHdl('enabled')) |
|
| 1708 | + langHdl('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? langHdl('disabled') : langHdl('enabled')) |
|
| 1709 | 1709 | ); |
| 1710 | 1710 | |
| 1711 | 1711 | // Log |
@@ -1716,15 +1716,15 @@ discard block |
||
| 1716 | 1716 | $_SESSION['user_id'], |
| 1717 | 1717 | 'at_modification', |
| 1718 | 1718 | $_SESSION['login'], |
| 1719 | - 'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 1719 | + 'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 1720 | 1720 | ); |
| 1721 | 1721 | } |
| 1722 | 1722 | |
| 1723 | 1723 | // Reload new values |
| 1724 | 1724 | $dataItem = DB::queryfirstrow( |
| 1725 | 1725 | 'SELECT * |
| 1726 | - FROM ' . prefixTable('items') . ' as i |
|
| 1727 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 1726 | + FROM ' . prefixTable('items').' as i |
|
| 1727 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 1728 | 1728 | WHERE i.id = %i AND l.action = %s', |
| 1729 | 1729 | $post_item_id, |
| 1730 | 1730 | 'at_creation' |
@@ -1733,8 +1733,8 @@ discard block |
||
| 1733 | 1733 | $history = ''; |
| 1734 | 1734 | $rows = DB::query( |
| 1735 | 1735 | 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login |
| 1736 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 1737 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 1736 | + FROM ' . prefixTable('log_items').' as l |
|
| 1737 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 1738 | 1738 | WHERE l.action <> %s AND id_item=%s', |
| 1739 | 1739 | 'at_shown', |
| 1740 | 1740 | $post_item_id |
@@ -1742,14 +1742,14 @@ discard block |
||
| 1742 | 1742 | foreach ($rows as $record) { |
| 1743 | 1743 | $reason = explode(':', $record['raison']); |
| 1744 | 1744 | if (count($reason) > 0) { |
| 1745 | - $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $record['date']) . ' - ' |
|
| 1746 | - . $record['login'] . ' - ' . langHdl($record['action']) . ' - ' |
|
| 1747 | - . (empty($record['raison']) === false ? (count($reason) > 1 ? langHdl(trim($reason[0])) . ' : ' . $reason[1] |
|
| 1745 | + $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $record['date']).' - ' |
|
| 1746 | + . $record['login'].' - '.langHdl($record['action']).' - ' |
|
| 1747 | + . (empty($record['raison']) === false ? (count($reason) > 1 ? langHdl(trim($reason[0])).' : '.$reason[1] |
|
| 1748 | 1748 | : langHdl(trim($reason[0]))) : ''); |
| 1749 | 1749 | if (empty($history)) { |
| 1750 | 1750 | $history = $sentence; |
| 1751 | 1751 | } else { |
| 1752 | - $history .= '<br />' . $sentence; |
|
| 1752 | + $history .= '<br />'.$sentence; |
|
| 1753 | 1753 | } |
| 1754 | 1754 | } |
| 1755 | 1755 | } |
@@ -1760,19 +1760,19 @@ discard block |
||
| 1760 | 1760 | // Prepare files listing |
| 1761 | 1761 | $files = $filesEdit = ''; |
| 1762 | 1762 | // launch query |
| 1763 | - $rows = DB::query('SELECT id, name, file, extension FROM ' . prefixTable('files') . ' WHERE id_item=%i', $post_item_id); |
|
| 1763 | + $rows = DB::query('SELECT id, name, file, extension FROM '.prefixTable('files').' WHERE id_item=%i', $post_item_id); |
|
| 1764 | 1764 | foreach ($rows as $record) { |
| 1765 | 1765 | // get icon image depending on file format |
| 1766 | 1766 | $iconImage = fileFormatImage($record['extension']); |
| 1767 | 1767 | |
| 1768 | 1768 | // If file is an image, then prepare lightbox. If not image, then prepare donwload |
| 1769 | 1769 | if (in_array($record['extension'], TP_IMAGE_FILE_EXT)) { |
| 1770 | - $files .= '<i class=\'fa fa-file-image-o\' /></i> <a class="image_dialog" href="#' . $record['id'] . '" title="' . $record['name'] . '">' . $record['name'] . '</a><br />'; |
|
| 1770 | + $files .= '<i class=\'fa fa-file-image-o\' /></i> <a class="image_dialog" href="#'.$record['id'].'" title="'.$record['name'].'">'.$record['name'].'</a><br />'; |
|
| 1771 | 1771 | } else { |
| 1772 | - $files .= '<i class=\'fa fa-file-text-o\' /></i> <a href=\'sources/downloadFile.php?name=' . urlencode($record['name']) . '&type=sub&key=' . $_SESSION['key'] . '&key_tmp=' . $_SESSION['key_tmp'] . '&fileid=' . $record['id'] . '\' target=\'_blank\'>' . $record['name'] . '</a><br />'; |
|
| 1772 | + $files .= '<i class=\'fa fa-file-text-o\' /></i> <a href=\'sources/downloadFile.php?name='.urlencode($record['name']).'&type=sub&key='.$_SESSION['key'].'&key_tmp='.$_SESSION['key_tmp'].'&fileid='.$record['id'].'\' target=\'_blank\'>'.$record['name'].'</a><br />'; |
|
| 1773 | 1773 | } |
| 1774 | 1774 | // Prepare list of files for edit dialogbox |
| 1775 | - $filesEdit .= '<span id="span_edit_file_' . $record['id'] . '"><span class="fa fa-' . $iconImage . '"></span> <span class="fa fa-eraser tip" style="cursor:pointer;" onclick="delete_attached_file(\"' . $record['id'] . '\")" title="' . langHdl('at_delete') . '"></span> ' . $record['name'] . '</span><br />'; |
|
| 1775 | + $filesEdit .= '<span id="span_edit_file_'.$record['id'].'"><span class="fa fa-'.$iconImage.'"></span> <span class="fa fa-eraser tip" style="cursor:pointer;" onclick="delete_attached_file(\"'.$record['id'].'\")" title="'.langHdl('at_delete').'"></span> '.$record['name'].'</span><br />'; |
|
| 1776 | 1776 | } |
| 1777 | 1777 | // Send email |
| 1778 | 1778 | if (is_array($post_diffusion_list) === true && count($post_diffusion_list) > 0) { |
@@ -1887,7 +1887,7 @@ discard block |
||
| 1887 | 1887 | ) { |
| 1888 | 1888 | // load the original record into an array |
| 1889 | 1889 | $originalRecord = DB::queryfirstrow( |
| 1890 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 1890 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 1891 | 1891 | WHERE id = %i', |
| 1892 | 1892 | $post_item_id |
| 1893 | 1893 | ); |
@@ -1906,7 +1906,7 @@ discard block |
||
| 1906 | 1906 | |
| 1907 | 1907 | // Load the destination folder record into an array |
| 1908 | 1908 | $dataDestination = DB::queryfirstrow( |
| 1909 | - 'SELECT personal_folder FROM ' . prefixTable('nested_tree') . ' |
|
| 1909 | + 'SELECT personal_folder FROM '.prefixTable('nested_tree').' |
|
| 1910 | 1910 | WHERE id = %i', |
| 1911 | 1911 | $post_dest_id |
| 1912 | 1912 | ); |
@@ -1914,7 +1914,7 @@ discard block |
||
| 1914 | 1914 | // Get the ITEM object key for the user |
| 1915 | 1915 | $userKey = DB::queryFirstRow( |
| 1916 | 1916 | 'SELECT share_key |
| 1917 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1917 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1918 | 1918 | WHERE user_id = %i AND object_id = %i', |
| 1919 | 1919 | $_SESSION['user_id'], |
| 1920 | 1920 | $post_item_id |
@@ -1986,7 +1986,7 @@ discard block |
||
| 1986 | 1986 | // Manage Custom Fields |
| 1987 | 1987 | $rows = DB::query( |
| 1988 | 1988 | 'SELECT * |
| 1989 | - FROM ' . prefixTable('categories_items') . ' |
|
| 1989 | + FROM ' . prefixTable('categories_items').' |
|
| 1990 | 1990 | WHERE item_id = %i', |
| 1991 | 1991 | $post_item_id |
| 1992 | 1992 | ); |
@@ -2034,15 +2034,15 @@ discard block |
||
| 2034 | 2034 | $rows = DB::query( |
| 2035 | 2035 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
| 2036 | 2036 | f.size AS size, f.type AS type, s.share_key AS share_key |
| 2037 | - FROM ' . prefixTable('files') . ' AS f |
|
| 2038 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 2037 | + FROM ' . prefixTable('files').' AS f |
|
| 2038 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 2039 | 2039 | WHERE s.user_id = %i AND f.id_item = %i', |
| 2040 | 2040 | $_SESSION['user_id'], |
| 2041 | 2041 | $post_item_id |
| 2042 | 2042 | ); |
| 2043 | 2043 | foreach ($rows as $record) { |
| 2044 | 2044 | // Check if file still exists |
| 2045 | - if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) { |
|
| 2045 | + if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) { |
|
| 2046 | 2046 | // Step1 - decrypt the file |
| 2047 | 2047 | $fileContent = decryptFile( |
| 2048 | 2048 | $record['file'], |
@@ -2051,9 +2051,9 @@ discard block |
||
| 2051 | 2051 | ); |
| 2052 | 2052 | |
| 2053 | 2053 | // Step2 - create file |
| 2054 | - $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension']; |
|
| 2054 | + $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension']; |
|
| 2055 | 2055 | fwrite( |
| 2056 | - fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab'), |
|
| 2056 | + fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab'), |
|
| 2057 | 2057 | base64_decode($fileContent) |
| 2058 | 2058 | ); |
| 2059 | 2059 | |
@@ -2091,7 +2091,7 @@ discard block |
||
| 2091 | 2091 | |
| 2092 | 2092 | // ------------------------- |
| 2093 | 2093 | // Add specific restrictions |
| 2094 | - $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $post_item_id); |
|
| 2094 | + $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $post_item_id); |
|
| 2095 | 2095 | foreach ($rows as $record) { |
| 2096 | 2096 | DB::insert( |
| 2097 | 2097 | prefixTable('restriction_to_roles'), |
@@ -2103,7 +2103,7 @@ discard block |
||
| 2103 | 2103 | } |
| 2104 | 2104 | |
| 2105 | 2105 | // Add Tags |
| 2106 | - $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $post_item_id); |
|
| 2106 | + $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $post_item_id); |
|
| 2107 | 2107 | foreach ($rows as $record) { |
| 2108 | 2108 | DB::insert( |
| 2109 | 2109 | prefixTable('tags'), |
@@ -2133,7 +2133,7 @@ discard block |
||
| 2133 | 2133 | $_SESSION['login'] |
| 2134 | 2134 | ); |
| 2135 | 2135 | // reload cache table |
| 2136 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 2136 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 2137 | 2137 | updateCacheTable('reload', $SETTINGS, ''); |
| 2138 | 2138 | |
| 2139 | 2139 | echo (string) prepareExchangedData( |
@@ -2205,7 +2205,7 @@ discard block |
||
| 2205 | 2205 | // then we can show it |
| 2206 | 2206 | $item_deleted = DB::queryFirstRow( |
| 2207 | 2207 | 'SELECT * |
| 2208 | - FROM ' . prefixTable('log_items') . ' |
|
| 2208 | + FROM ' . prefixTable('log_items').' |
|
| 2209 | 2209 | WHERE id_item = %i AND action = %s |
| 2210 | 2210 | ORDER BY date DESC |
| 2211 | 2211 | LIMIT 0, 1', |
@@ -2216,7 +2216,7 @@ discard block |
||
| 2216 | 2216 | |
| 2217 | 2217 | $item_restored = DB::queryFirstRow( |
| 2218 | 2218 | 'SELECT * |
| 2219 | - FROM ' . prefixTable('log_items') . ' |
|
| 2219 | + FROM ' . prefixTable('log_items').' |
|
| 2220 | 2220 | WHERE id_item = %i AND action = %s |
| 2221 | 2221 | ORDER BY date DESC |
| 2222 | 2222 | LIMIT 0, 1', |
@@ -2240,8 +2240,8 @@ discard block |
||
| 2240 | 2240 | // Get all informations for this item |
| 2241 | 2241 | $dataItem = DB::queryfirstrow( |
| 2242 | 2242 | 'SELECT * |
| 2243 | - FROM ' . prefixTable('items') . ' as i |
|
| 2244 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2243 | + FROM ' . prefixTable('items').' as i |
|
| 2244 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2245 | 2245 | WHERE i.id = %i AND l.action = %s', |
| 2246 | 2246 | $post_id, |
| 2247 | 2247 | 'at_creation' |
@@ -2250,7 +2250,7 @@ discard block |
||
| 2250 | 2250 | // Notification |
| 2251 | 2251 | DB::queryfirstrow( |
| 2252 | 2252 | 'SELECT * |
| 2253 | - FROM ' . prefixTable('notification') . ' |
|
| 2253 | + FROM ' . prefixTable('notification').' |
|
| 2254 | 2254 | WHERE item_id = %i AND user_id = %i', |
| 2255 | 2255 | $post_id, |
| 2256 | 2256 | $_SESSION['user_id'] |
@@ -2297,13 +2297,13 @@ discard block |
||
| 2297 | 2297 | && $SETTINGS['enable_email_notification_on_item_shown'] === '1' |
| 2298 | 2298 | && $user['admin'] === '1' |
| 2299 | 2299 | ) { |
| 2300 | - $_SESSION['listNotificationEmails'] .= $user['email'] . ','; |
|
| 2300 | + $_SESSION['listNotificationEmails'] .= $user['email'].','; |
|
| 2301 | 2301 | } |
| 2302 | 2302 | } |
| 2303 | 2303 | |
| 2304 | 2304 | // manage case of API user |
| 2305 | 2305 | if ($dataItem['id_user'] === API_USER_ID) { |
| 2306 | - $arrData['author'] = 'API [' . $dataItem['description'] . ']'; |
|
| 2306 | + $arrData['author'] = 'API ['.$dataItem['description'].']'; |
|
| 2307 | 2307 | $arrData['id_user'] = API_USER_ID; |
| 2308 | 2308 | $arrData['author_email'] = ''; |
| 2309 | 2309 | $arrData['notification_status'] = false; |
@@ -2313,7 +2313,7 @@ discard block |
||
| 2313 | 2313 | $tags = array(); |
| 2314 | 2314 | $rows = DB::query( |
| 2315 | 2315 | 'SELECT tag |
| 2316 | - FROM ' . prefixTable('tags') . ' |
|
| 2316 | + FROM ' . prefixTable('tags').' |
|
| 2317 | 2317 | WHERE item_id = %i', |
| 2318 | 2318 | $post_id |
| 2319 | 2319 | ); |
@@ -2338,7 +2338,7 @@ discard block |
||
| 2338 | 2338 | // Check if user has a role that is accepted |
| 2339 | 2339 | $rows_tmp = DB::query( |
| 2340 | 2340 | 'SELECT role_id |
| 2341 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 2341 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 2342 | 2342 | WHERE item_id=%i', |
| 2343 | 2343 | $post_id |
| 2344 | 2344 | ); |
@@ -2352,11 +2352,11 @@ discard block |
||
| 2352 | 2352 | // Get the object key for the user |
| 2353 | 2353 | $userKey = DB::queryFirstRow( |
| 2354 | 2354 | 'SELECT share_key |
| 2355 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2355 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2356 | 2356 | WHERE user_id = %i AND object_id = %i', |
| 2357 | 2357 | $_SESSION['user_id'], |
| 2358 | 2358 | $post_id |
| 2359 | - );//print_r($_SESSION['user']); |
|
| 2359 | + ); //print_r($_SESSION['user']); |
|
| 2360 | 2360 | if (DB::count() === 0 || empty($dataItem['pw']) === true) { |
| 2361 | 2361 | // No share key found |
| 2362 | 2362 | $pw = ''; |
@@ -2437,8 +2437,8 @@ discard block |
||
| 2437 | 2437 | // Add restriction if item is restricted to roles |
| 2438 | 2438 | $rows = DB::query( |
| 2439 | 2439 | 'SELECT t.title, t.id |
| 2440 | - FROM ' . prefixTable('roles_title') . ' AS t |
|
| 2441 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id) |
|
| 2440 | + FROM ' . prefixTable('roles_title').' AS t |
|
| 2441 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id) |
|
| 2442 | 2442 | WHERE r.item_id = %i |
| 2443 | 2443 | ORDER BY t.title ASC', |
| 2444 | 2444 | $post_id |
@@ -2454,8 +2454,8 @@ discard block |
||
| 2454 | 2454 | $tmp = array(); |
| 2455 | 2455 | $rows = DB::query( |
| 2456 | 2456 | 'SELECT k.label, k.id |
| 2457 | - FROM ' . prefixTable('kb_items') . ' as i |
|
| 2458 | - INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id) |
|
| 2457 | + FROM ' . prefixTable('kb_items').' as i |
|
| 2458 | + INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id) |
|
| 2459 | 2459 | WHERE i.item_id = %i |
| 2460 | 2460 | ORDER BY k.label ASC', |
| 2461 | 2461 | $post_id |
@@ -2535,7 +2535,7 @@ discard block |
||
| 2535 | 2535 | $arrCatList = array(); |
| 2536 | 2536 | $rows_tmp = DB::query( |
| 2537 | 2537 | 'SELECT id_category |
| 2538 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 2538 | + FROM ' . prefixTable('categories_folders').' |
|
| 2539 | 2539 | WHERE id_folder=%i', |
| 2540 | 2540 | $post_folder_id |
| 2541 | 2541 | ); |
@@ -2550,8 +2550,8 @@ discard block |
||
| 2550 | 2550 | 'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id, |
| 2551 | 2551 | i.encryption_type AS encryption_type, c.encrypted_data, c.parent_id AS parent_id, |
| 2552 | 2552 | c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility |
| 2553 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 2554 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 2553 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 2554 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 2555 | 2555 | WHERE i.item_id=%i AND c.parent_id IN %ls', |
| 2556 | 2556 | $post_id, |
| 2557 | 2557 | $arrCatList |
@@ -2562,11 +2562,11 @@ discard block |
||
| 2562 | 2562 | //db::debugmode(true); |
| 2563 | 2563 | $userKey = DB::queryFirstRow( |
| 2564 | 2564 | 'SELECT share_key |
| 2565 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2565 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2566 | 2566 | WHERE user_id = %i AND object_id = %i', |
| 2567 | 2567 | $_SESSION['user_id'], |
| 2568 | 2568 | $row['id'] |
| 2569 | - );//db::debugmode(false); |
|
| 2569 | + ); //db::debugmode(false); |
|
| 2570 | 2570 | if (DB::count() === 0) { |
| 2571 | 2571 | // Not encrypted |
| 2572 | 2572 | $fieldText['string'] = $row['data']; |
@@ -2607,7 +2607,7 @@ discard block |
||
| 2607 | 2607 | if (isset($SETTINGS['item_creation_templates']) && $SETTINGS['item_creation_templates'] === '1') { |
| 2608 | 2608 | $rows_tmp = DB::queryfirstrow( |
| 2609 | 2609 | 'SELECT category_id |
| 2610 | - FROM ' . prefixTable('templates') . ' |
|
| 2610 | + FROM ' . prefixTable('templates').' |
|
| 2611 | 2611 | WHERE item_id = %i', |
| 2612 | 2612 | $post_id |
| 2613 | 2613 | ); |
@@ -2632,7 +2632,7 @@ discard block |
||
| 2632 | 2632 | // Is the Item to be deleted? |
| 2633 | 2633 | $dataDelete = DB::queryfirstrow( |
| 2634 | 2634 | 'SELECT * |
| 2635 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 2635 | + FROM ' . prefixTable('automatic_del').' |
|
| 2636 | 2636 | WHERE item_id = %i', |
| 2637 | 2637 | $post_id |
| 2638 | 2638 | ); |
@@ -2714,11 +2714,11 @@ discard block |
||
| 2714 | 2714 | if (empty($dataItem['restricted_to']) === false) { |
| 2715 | 2715 | foreach (explode(';', $dataItem['restricted_to']) as $userRest) { |
| 2716 | 2716 | if (empty($userRest) === false) { |
| 2717 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
| 2717 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
| 2718 | 2718 | if (empty($listOfRestricted)) { |
| 2719 | 2719 | $listOfRestricted = $dataTmp['login']; |
| 2720 | 2720 | } else { |
| 2721 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 2721 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 2722 | 2722 | } |
| 2723 | 2723 | } |
| 2724 | 2724 | } |
@@ -2774,8 +2774,8 @@ discard block |
||
| 2774 | 2774 | // Load item data |
| 2775 | 2775 | $dataItem = DB::queryFirstRow( |
| 2776 | 2776 | 'SELECT i.*, n.title AS folder_title |
| 2777 | - FROM ' . prefixTable('items') . ' AS i |
|
| 2778 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 2777 | + FROM ' . prefixTable('items').' AS i |
|
| 2778 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 2779 | 2779 | WHERE i.id = %i', |
| 2780 | 2780 | $post_id |
| 2781 | 2781 | ); |
@@ -2797,7 +2797,7 @@ discard block |
||
| 2797 | 2797 | // Check if user has a role that is accepted |
| 2798 | 2798 | $rows_tmp = DB::query( |
| 2799 | 2799 | 'SELECT role_id |
| 2800 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 2800 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 2801 | 2801 | WHERE item_id=%i', |
| 2802 | 2802 | $post_id |
| 2803 | 2803 | ); |
@@ -2894,7 +2894,7 @@ discard block |
||
| 2894 | 2894 | // launch query |
| 2895 | 2895 | $rows = DB::query( |
| 2896 | 2896 | 'SELECT id, name, file, extension, size |
| 2897 | - FROM ' . prefixTable('files') . ' |
|
| 2897 | + FROM ' . prefixTable('files').' |
|
| 2898 | 2898 | WHERE id_item = %i AND confirmed = 1', |
| 2899 | 2899 | $post_id |
| 2900 | 2900 | ); |
@@ -2903,7 +2903,7 @@ discard block |
||
| 2903 | 2903 | $attachments, |
| 2904 | 2904 | array( |
| 2905 | 2905 | 'icon' => fileFormatImage(strtolower($record['extension'])), |
| 2906 | - 'filename' => basename($record['name'], '.' . $record['extension']), |
|
| 2906 | + 'filename' => basename($record['name'], '.'.$record['extension']), |
|
| 2907 | 2907 | 'extension' => $record['extension'], |
| 2908 | 2908 | 'size' => formatSizeUnits($record['size']), |
| 2909 | 2909 | 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, |
@@ -2932,7 +2932,7 @@ discard block |
||
| 2932 | 2932 | array( |
| 2933 | 2933 | 'latest_items' => implode(';', $_SESSION['latest_items']), |
| 2934 | 2934 | ), |
| 2935 | - 'id=' . $_SESSION['user_id'] |
|
| 2935 | + 'id='.$_SESSION['user_id'] |
|
| 2936 | 2936 | ); |
| 2937 | 2937 | } |
| 2938 | 2938 | |
@@ -2941,8 +2941,8 @@ discard block |
||
| 2941 | 2941 | $listOptionsForRoles = array(); |
| 2942 | 2942 | $rows = DB::query( |
| 2943 | 2943 | 'SELECT r.role_id AS role_id, t.title AS title |
| 2944 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 2945 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 2944 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 2945 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 2946 | 2946 | WHERE r.folder_id = %i', |
| 2947 | 2947 | $dataItem['id_tree'] |
| 2948 | 2948 | ); |
@@ -2956,9 +2956,9 @@ discard block |
||
| 2956 | 2956 | ); |
| 2957 | 2957 | $rows2 = DB::query( |
| 2958 | 2958 | 'SELECT id, login, fonction_id, email, name, lastname |
| 2959 | - FROM ' . prefixTable('users') . ' |
|
| 2959 | + FROM ' . prefixTable('users').' |
|
| 2960 | 2960 | WHERE fonction_id LIKE %s', |
| 2961 | - '%' . $record['role_id'] . '%' |
|
| 2961 | + '%'.$record['role_id'].'%' |
|
| 2962 | 2962 | ); |
| 2963 | 2963 | foreach ($rows2 as $record2) { |
| 2964 | 2964 | foreach (explode(';', $record2['fonction_id']) as $role) { |
@@ -2971,7 +2971,7 @@ discard block |
||
| 2971 | 2971 | array( |
| 2972 | 2972 | 'id' => (int) $record2['id'], |
| 2973 | 2973 | 'login' => $record2['login'], |
| 2974 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 2974 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 2975 | 2975 | 'email' => $record2['email'], |
| 2976 | 2976 | ) |
| 2977 | 2977 | ); |
@@ -2990,16 +2990,16 @@ discard block |
||
| 2990 | 2990 | $path = ''; |
| 2991 | 2991 | foreach ($arbo as $elem) { |
| 2992 | 2992 | if (empty($path) === true) { |
| 2993 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 2993 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 2994 | 2994 | } else { |
| 2995 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 2995 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 2996 | 2996 | } |
| 2997 | 2997 | } |
| 2998 | 2998 | // Build text to show user |
| 2999 | 2999 | if (empty($path) === true) { |
| 3000 | 3000 | $path = addslashes($dataItem['label']); |
| 3001 | 3001 | } else { |
| 3002 | - $path = addslashes($dataItem['label']) . ' (' . $path . ')'; |
|
| 3002 | + $path = addslashes($dataItem['label']).' ('.$path.')'; |
|
| 3003 | 3003 | } |
| 3004 | 3004 | |
| 3005 | 3005 | // send back infos |
@@ -3013,7 +3013,7 @@ discard block |
||
| 3013 | 3013 | array( |
| 3014 | 3014 | addslashes($_SESSION['login']), |
| 3015 | 3015 | $path, |
| 3016 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'], |
|
| 3016 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'], |
|
| 3017 | 3017 | ), |
| 3018 | 3018 | langHdl('email_on_open_notification_mail') |
| 3019 | 3019 | ), |
@@ -3024,7 +3024,7 @@ discard block |
||
| 3024 | 3024 | } |
| 3025 | 3025 | |
| 3026 | 3026 | // has this item a change proposal |
| 3027 | - DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $post_id); |
|
| 3027 | + DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $post_id); |
|
| 3028 | 3028 | $returnArray['has_change_proposal'] = DB::count(); |
| 3029 | 3029 | |
| 3030 | 3030 | // Setting |
@@ -3109,7 +3109,7 @@ discard block |
||
| 3109 | 3109 | // Load item data |
| 3110 | 3110 | $data = DB::queryFirstRow( |
| 3111 | 3111 | 'SELECT id_tree |
| 3112 | - FROM ' . prefixTable('items') . ' |
|
| 3112 | + FROM ' . prefixTable('items').' |
|
| 3113 | 3113 | WHERE id = %i', |
| 3114 | 3114 | $post_item_id |
| 3115 | 3115 | ); |
@@ -3178,13 +3178,13 @@ discard block |
||
| 3178 | 3178 | |
| 3179 | 3179 | // Check if user is allowed to access this folder |
| 3180 | 3180 | if (!in_array($post_folder_id, $_SESSION['groupes_visibles'])) { |
| 3181 | - echo '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3181 | + echo '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3182 | 3182 | break; |
| 3183 | 3183 | } |
| 3184 | 3184 | |
| 3185 | 3185 | // Check if title doesn't contains html codes |
| 3186 | 3186 | if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) { |
| 3187 | - echo '[ { "error" : "' . langHdl('error_html_codes') . '" } ]'; |
|
| 3187 | + echo '[ { "error" : "'.langHdl('error_html_codes').'" } ]'; |
|
| 3188 | 3188 | break; |
| 3189 | 3189 | } |
| 3190 | 3190 | // check that title is not numeric |
@@ -3196,9 +3196,9 @@ discard block |
||
| 3196 | 3196 | // Check if duplicate folders name are allowed |
| 3197 | 3197 | $createNewFolder = true; |
| 3198 | 3198 | if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') { |
| 3199 | - $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title); |
|
| 3199 | + $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title); |
|
| 3200 | 3200 | if (empty($data['id']) === false && $dataReceived['folder'] != $data['id']) { |
| 3201 | - echo '[ { "error" : "' . langHdl('error_group_exist') . '" } ]'; |
|
| 3201 | + echo '[ { "error" : "'.langHdl('error_group_exist').'" } ]'; |
|
| 3202 | 3202 | break; |
| 3203 | 3203 | } |
| 3204 | 3204 | } |
@@ -3206,7 +3206,7 @@ discard block |
||
| 3206 | 3206 | // query on folder |
| 3207 | 3207 | $data = DB::queryfirstrow( |
| 3208 | 3208 | 'SELECT parent_id, personal_folder |
| 3209 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3209 | + FROM ' . prefixTable('nested_tree').' |
|
| 3210 | 3210 | WHERE id = %i', |
| 3211 | 3211 | $post_folder_id |
| 3212 | 3212 | ); |
@@ -3216,20 +3216,20 @@ discard block |
||
| 3216 | 3216 | if ($_SESSION['is_admin'] != 1 && $_SESSION['user_manager'] != 1 && $data['personal_folder'] === '0') { |
| 3217 | 3217 | $data = DB::queryfirstrow( |
| 3218 | 3218 | 'SELECT valeur |
| 3219 | - FROM ' . prefixTable('misc') . ' |
|
| 3219 | + FROM ' . prefixTable('misc').' |
|
| 3220 | 3220 | WHERE intitule = %i AND type = %s', |
| 3221 | 3221 | $data['parent_id'], |
| 3222 | 3222 | 'complex' |
| 3223 | 3223 | ); |
| 3224 | 3224 | if (intval($dataReceived['complexity']) < intval($data['valeur'])) { |
| 3225 | - echo '[ { "error" : "' . langHdl('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]'; |
|
| 3225 | + echo '[ { "error" : "'.langHdl('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]'; |
|
| 3226 | 3226 | break; |
| 3227 | 3227 | } |
| 3228 | 3228 | } |
| 3229 | 3229 | |
| 3230 | 3230 | // update Folders table |
| 3231 | 3231 | $tmp = DB::queryFirstRow( |
| 3232 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 3232 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 3233 | 3233 | $dataReceived['folder'] |
| 3234 | 3234 | ); |
| 3235 | 3235 | if ($tmp['parent_id'] != 0 || $tmp['title'] != $_SESSION['user_id'] || $tmp['personal_folder'] != 1) { |
@@ -3293,42 +3293,42 @@ discard block |
||
| 3293 | 3293 | in_array($post_target_folder_id, $_SESSION['groupes_visibles']) === false) && ($post_target_folder_id === '0' && |
| 3294 | 3294 | isset($SETTINGS['can_create_root_folder']) === true && $SETTINGS['can_create_root_folder'] === '1') |
| 3295 | 3295 | ) { |
| 3296 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3296 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3297 | 3297 | echo $returnValues; |
| 3298 | 3298 | break; |
| 3299 | 3299 | } |
| 3300 | 3300 | |
| 3301 | 3301 | $tmp_source = DB::queryFirstRow( |
| 3302 | 3302 | 'SELECT title, parent_id, personal_folder |
| 3303 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3303 | + FROM ' . prefixTable('nested_tree').' |
|
| 3304 | 3304 | WHERE id = %i', |
| 3305 | 3305 | $post_source_folder_id |
| 3306 | 3306 | ); |
| 3307 | 3307 | |
| 3308 | 3308 | $tmp_target = DB::queryFirstRow( |
| 3309 | 3309 | 'SELECT title, parent_id, personal_folder |
| 3310 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3310 | + FROM ' . prefixTable('nested_tree').' |
|
| 3311 | 3311 | WHERE id = %i', |
| 3312 | 3312 | $post_target_folder_id |
| 3313 | 3313 | ); |
| 3314 | 3314 | |
| 3315 | 3315 | // check if target is not a child of source |
| 3316 | 3316 | if ($tree->isChildOf($post_target_folder_id, $post_source_folder_id) === true) { |
| 3317 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3317 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3318 | 3318 | echo $returnValues; |
| 3319 | 3319 | break; |
| 3320 | 3320 | } |
| 3321 | 3321 | |
| 3322 | 3322 | // check if source or target folder is PF. If Yes, then cancel operation |
| 3323 | 3323 | if ($tmp_source['personal_folder'] === '1' || $tmp_target['personal_folder'] === '1') { |
| 3324 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3324 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3325 | 3325 | echo $returnValues; |
| 3326 | 3326 | break; |
| 3327 | 3327 | } |
| 3328 | 3328 | |
| 3329 | 3329 | // check if source or target folder is PF. If Yes, then cancel operation |
| 3330 | 3330 | if ($tmp_source['title'] === $_SESSION['user_id'] || $tmp_target['title'] === $_SESSION['user_id']) { |
| 3331 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3331 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3332 | 3332 | echo $returnValues; |
| 3333 | 3333 | break; |
| 3334 | 3334 | } |
@@ -3451,7 +3451,7 @@ discard block |
||
| 3451 | 3451 | foreach ($_SESSION['user_roles'] as $role) { |
| 3452 | 3452 | $roleQ = DB::queryfirstrow( |
| 3453 | 3453 | 'SELECT allow_pw_change |
| 3454 | - FROM ' . prefixTable('roles_title') . ' |
|
| 3454 | + FROM ' . prefixTable('roles_title').' |
|
| 3455 | 3455 | WHERE id = %i', |
| 3456 | 3456 | $role |
| 3457 | 3457 | ); |
@@ -3477,12 +3477,12 @@ discard block |
||
| 3477 | 3477 | foreach ($_SESSION['user_roles'] as $role) { |
| 3478 | 3478 | //db::debugmode(true); |
| 3479 | 3479 | $access = DB::queryFirstRow( |
| 3480 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
| 3480 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
| 3481 | 3481 | $role, |
| 3482 | 3482 | $post_id |
| 3483 | 3483 | ); |
| 3484 | 3484 | //db::debugmode(false);exit(); |
| 3485 | - if (DB::count()>0) { |
|
| 3485 | + if (DB::count() > 0) { |
|
| 3486 | 3486 | if ($access['type'] === 'R') { |
| 3487 | 3487 | array_push($arrTmp, 10); |
| 3488 | 3488 | } elseif ($access['type'] === 'W') { |
@@ -3546,7 +3546,7 @@ discard block |
||
| 3546 | 3546 | } else { |
| 3547 | 3547 | DB::query( |
| 3548 | 3548 | 'SELECT * |
| 3549 | - FROM ' . prefixTable('items') . ' |
|
| 3549 | + FROM ' . prefixTable('items').' |
|
| 3550 | 3550 | WHERE inactif = %i', |
| 3551 | 3551 | 0 |
| 3552 | 3552 | ); |
@@ -3557,7 +3557,7 @@ discard block |
||
| 3557 | 3557 | |
| 3558 | 3558 | // Get folder complexity |
| 3559 | 3559 | $folderComplexity = DB::queryFirstRow( |
| 3560 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i', |
|
| 3560 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i', |
|
| 3561 | 3561 | 'complex', |
| 3562 | 3562 | $post_id |
| 3563 | 3563 | ); |
@@ -3569,7 +3569,7 @@ discard block |
||
| 3569 | 3569 | if (isset($SETTINGS['item_extra_fields']) && $SETTINGS['item_extra_fields'] === '1') { |
| 3570 | 3570 | $folderRow = DB::query( |
| 3571 | 3571 | 'SELECT id_category |
| 3572 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 3572 | + FROM ' . prefixTable('categories_folders').' |
|
| 3573 | 3573 | WHERE id_folder = %i', |
| 3574 | 3574 | $post_id |
| 3575 | 3575 | ); |
@@ -3686,13 +3686,13 @@ discard block |
||
| 3686 | 3686 | // List all ITEMS |
| 3687 | 3687 | if ($folderIsPf === false) { |
| 3688 | 3688 | $where->add('i.inactif=%i', 0); |
| 3689 | - $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)"); |
|
| 3689 | + $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)"); |
|
| 3690 | 3690 | if (empty($limited_to_items) === false) { |
| 3691 | 3691 | $where->add('i.id IN %ls', explode(',', $limited_to_items)); |
| 3692 | 3692 | } |
| 3693 | 3693 | |
| 3694 | - $query_limit = ' LIMIT ' . |
|
| 3695 | - $start . ',' . |
|
| 3694 | + $query_limit = ' LIMIT '. |
|
| 3695 | + $start.','. |
|
| 3696 | 3696 | $post_nb_items_to_display_once; |
| 3697 | 3697 | //db::debugmode(true); |
| 3698 | 3698 | $rows = DB::query( |
@@ -3701,9 +3701,9 @@ discard block |
||
| 3701 | 3701 | MIN(i.anyone_can_modify) AS anyone_can_modify, l.date AS date, i.id_tree AS tree_id, |
| 3702 | 3702 | MIN(n.renewal_period) AS renewal_period, |
| 3703 | 3703 | MIN(l.action) AS log_action, l.id_user AS log_user |
| 3704 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3705 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 3706 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 3704 | + FROM ' . prefixTable('items').' AS i |
|
| 3705 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 3706 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 3707 | 3707 | WHERE %l |
| 3708 | 3708 | GROUP BY i.id, l.date, l.id_user, l.action |
| 3709 | 3709 | ORDER BY i.label ASC, l.date DESC' . $query_limit, |
@@ -3720,9 +3720,9 @@ discard block |
||
| 3720 | 3720 | MIN(i.anyone_can_modify) AS anyone_can_modify,l.date AS date, i.id_tree AS tree_id, |
| 3721 | 3721 | MIN(n.renewal_period) AS renewal_period, |
| 3722 | 3722 | MIN(l.action) AS log_action, l.id_user AS log_user |
| 3723 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3724 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 3725 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 3723 | + FROM ' . prefixTable('items').' AS i |
|
| 3724 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 3725 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 3726 | 3726 | WHERE %l |
| 3727 | 3727 | GROUP BY i.id, l.date, l.id_user, l.action |
| 3728 | 3728 | ORDER BY i.label ASC, l.date DESC', |
@@ -3754,7 +3754,7 @@ discard block |
||
| 3754 | 3754 | $item_is_restricted_to_role = false; |
| 3755 | 3755 | DB::queryfirstrow( |
| 3756 | 3756 | 'SELECT role_id |
| 3757 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 3757 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 3758 | 3758 | WHERE item_id = %i', |
| 3759 | 3759 | $record['id'] |
| 3760 | 3760 | ); |
@@ -3766,7 +3766,7 @@ discard block |
||
| 3766 | 3766 | $user_is_included_in_role = false; |
| 3767 | 3767 | $roles = DB::query( |
| 3768 | 3768 | 'SELECT role_id |
| 3769 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 3769 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 3770 | 3770 | WHERE item_id = %i AND role_id IN %ls', |
| 3771 | 3771 | $record['id'], |
| 3772 | 3772 | $_SESSION['user_roles'] |
@@ -3973,9 +3973,9 @@ discard block |
||
| 3973 | 3973 | if ((int) $start === 0) { |
| 3974 | 3974 | DB::query( |
| 3975 | 3975 | 'SELECT i.id |
| 3976 | - FROM ' . prefixTable('items') . ' as i |
|
| 3977 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
| 3978 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item) |
|
| 3976 | + FROM ' . prefixTable('items').' as i |
|
| 3977 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
| 3978 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item) |
|
| 3979 | 3979 | WHERE %l |
| 3980 | 3980 | ORDER BY i.label ASC, l.date DESC', |
| 3981 | 3981 | $where |
@@ -4043,8 +4043,8 @@ discard block |
||
| 4043 | 4043 | // Run query |
| 4044 | 4044 | $dataItem = DB::queryfirstrow( |
| 4045 | 4045 | 'SELECT i.pw AS pw, s.share_key AS share_key |
| 4046 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4047 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
| 4046 | + FROM ' . prefixTable('items').' AS i |
|
| 4047 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
| 4048 | 4048 | WHERE user_id = %i AND i.id = %i', |
| 4049 | 4049 | $_SESSION['user_id'], |
| 4050 | 4050 | $post_item_id |
@@ -4087,7 +4087,7 @@ discard block |
||
| 4087 | 4087 | if (null !== $post_item_id && empty($post_item_id) === false) { |
| 4088 | 4088 | $dataItem = DB::queryfirstrow( |
| 4089 | 4089 | 'SELECT perso, anyone_can_modify |
| 4090 | - FROM ' . prefixTable('items') . ' |
|
| 4090 | + FROM ' . prefixTable('items').' |
|
| 4091 | 4091 | WHERE id=%i', |
| 4092 | 4092 | $post_item_id |
| 4093 | 4093 | ); |
@@ -4122,7 +4122,7 @@ discard block |
||
| 4122 | 4122 | } |
| 4123 | 4123 | |
| 4124 | 4124 | // Lock Item (if already locked), go back and warn |
| 4125 | - $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', $post_item_id); |
|
| 4125 | + $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', $post_item_id); |
|
| 4126 | 4126 | |
| 4127 | 4127 | // If token is taken for this Item and delay is passed then delete it. |
| 4128 | 4128 | if ( |
@@ -4133,7 +4133,7 @@ discard block |
||
| 4133 | 4133 | DB::delete(prefixTable('items_edition'), 'item_id = %i', $post_item_id); |
| 4134 | 4134 | //reload the previous data |
| 4135 | 4135 | $dataTmp = DB::queryFirstRow( |
| 4136 | - 'SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', |
|
| 4136 | + 'SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', |
|
| 4137 | 4137 | $post_item_id |
| 4138 | 4138 | ); |
| 4139 | 4139 | } |
@@ -4173,7 +4173,7 @@ discard block |
||
| 4173 | 4173 | // do query on this folder |
| 4174 | 4174 | $data_this_folder = DB::queryFirstRow( |
| 4175 | 4175 | 'SELECT id, personal_folder, title |
| 4176 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4176 | + FROM ' . prefixTable('nested_tree').' |
|
| 4177 | 4177 | WHERE id = %s', |
| 4178 | 4178 | $post_groupe |
| 4179 | 4179 | ); |
@@ -4210,8 +4210,8 @@ discard block |
||
| 4210 | 4210 | $visibilite = ''; |
| 4211 | 4211 | $data = DB::queryFirstRow( |
| 4212 | 4212 | 'SELECT m.valeur, n.personal_folder |
| 4213 | - FROM ' . prefixTable('misc') . ' AS m |
|
| 4214 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id) |
|
| 4213 | + FROM ' . prefixTable('misc').' AS m |
|
| 4214 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id) |
|
| 4215 | 4215 | WHERE type=%s AND intitule = %s', |
| 4216 | 4216 | 'complex', |
| 4217 | 4217 | $post_groupe |
@@ -4224,8 +4224,8 @@ discard block |
||
| 4224 | 4224 | // Prepare Item actual visibility (what Users/Roles can see it) |
| 4225 | 4225 | $rows = DB::query( |
| 4226 | 4226 | 'SELECT t.title |
| 4227 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 4228 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 4227 | + FROM ' . prefixTable('roles_values').' as v |
|
| 4228 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 4229 | 4229 | WHERE v.folder_id = %i |
| 4230 | 4230 | GROUP BY title', |
| 4231 | 4231 | $post_groupe |
@@ -4234,7 +4234,7 @@ discard block |
||
| 4234 | 4234 | if (empty($visibilite)) { |
| 4235 | 4235 | $visibilite = $record['title']; |
| 4236 | 4236 | } else { |
| 4237 | - $visibilite .= ' - ' . $record['title']; |
|
| 4237 | + $visibilite .= ' - '.$record['title']; |
|
| 4238 | 4238 | } |
| 4239 | 4239 | } |
| 4240 | 4240 | } else { |
@@ -4244,14 +4244,14 @@ discard block |
||
| 4244 | 4244 | // do new query to know if current folder is pf |
| 4245 | 4245 | $data_pf = DB::queryFirstRow( |
| 4246 | 4246 | 'SELECT personal_folder |
| 4247 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4247 | + FROM ' . prefixTable('nested_tree').' |
|
| 4248 | 4248 | WHERE id = %s', |
| 4249 | 4249 | $post_groupe |
| 4250 | 4250 | ); |
| 4251 | 4251 | |
| 4252 | 4252 | $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0; |
| 4253 | 4253 | |
| 4254 | - $visibilite = $_SESSION['name'] . ' ' . $_SESSION['lastname'] . ' (' . $_SESSION['login'] . ')'; |
|
| 4254 | + $visibilite = $_SESSION['name'].' '.$_SESSION['lastname'].' ('.$_SESSION['login'].')'; |
|
| 4255 | 4255 | } |
| 4256 | 4256 | |
| 4257 | 4257 | recupDroitCreationSansComplexite($post_groupe); |
@@ -4261,8 +4261,8 @@ discard block |
||
| 4261 | 4261 | $listOptionsForRoles = array(); |
| 4262 | 4262 | $rows = DB::query( |
| 4263 | 4263 | 'SELECT r.role_id AS role_id, t.title AS title |
| 4264 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 4265 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 4264 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 4265 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 4266 | 4266 | WHERE r.folder_id = %i', |
| 4267 | 4267 | $post_groupe |
| 4268 | 4268 | ); |
@@ -4276,7 +4276,7 @@ discard block |
||
| 4276 | 4276 | ); |
| 4277 | 4277 | $rows2 = DB::query( |
| 4278 | 4278 | 'SELECT id, login, fonction_id, email, name, lastname |
| 4279 | - FROM ' . prefixTable('users') . ' |
|
| 4279 | + FROM ' . prefixTable('users').' |
|
| 4280 | 4280 | WHERE admin = 0' |
| 4281 | 4281 | ); |
| 4282 | 4282 | foreach ($rows2 as $record2) { |
@@ -4290,7 +4290,7 @@ discard block |
||
| 4290 | 4290 | array( |
| 4291 | 4291 | 'id' => $record2['id'], |
| 4292 | 4292 | 'login' => $record2['login'], |
| 4293 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 4293 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 4294 | 4294 | 'email' => $record2['email'], |
| 4295 | 4295 | ) |
| 4296 | 4296 | ); |
@@ -4307,13 +4307,13 @@ discard block |
||
| 4307 | 4307 | //db::debugmode(true); |
| 4308 | 4308 | $access = DB::queryFirstRow( |
| 4309 | 4309 | 'SELECT type |
| 4310 | - FROM ' . prefixTable('roles_values') . ' |
|
| 4310 | + FROM ' . prefixTable('roles_values').' |
|
| 4311 | 4311 | WHERE role_id = %i AND folder_id = %i', |
| 4312 | 4312 | $role, |
| 4313 | 4313 | $post_groupe |
| 4314 | 4314 | ); |
| 4315 | 4315 | //db::debugmode(false); |
| 4316 | - if (DB::count()>0) { |
|
| 4316 | + if (DB::count() > 0) { |
|
| 4317 | 4317 | if ($access['type'] === 'R') { |
| 4318 | 4318 | array_push($arrTmp, 10); |
| 4319 | 4319 | } elseif ($access['type'] === 'W') { |
@@ -4383,7 +4383,7 @@ discard block |
||
| 4383 | 4383 | // Get some info before deleting |
| 4384 | 4384 | $data = DB::queryFirstRow( |
| 4385 | 4385 | 'SELECT name, id_item, file |
| 4386 | - FROM ' . prefixTable('files') . ' |
|
| 4386 | + FROM ' . prefixTable('files').' |
|
| 4387 | 4387 | WHERE id = %i', |
| 4388 | 4388 | $fileId |
| 4389 | 4389 | ); |
@@ -4391,7 +4391,7 @@ discard block |
||
| 4391 | 4391 | // Load item data |
| 4392 | 4392 | $data_item = DB::queryFirstRow( |
| 4393 | 4393 | 'SELECT id_tree |
| 4394 | - FROM ' . prefixTable('items') . ' |
|
| 4394 | + FROM ' . prefixTable('items').' |
|
| 4395 | 4395 | WHERE id = %i', |
| 4396 | 4396 | $data['id_item'] |
| 4397 | 4397 | ); |
@@ -4418,7 +4418,7 @@ discard block |
||
| 4418 | 4418 | $_SESSION['user_id'], |
| 4419 | 4419 | 'at_modification', |
| 4420 | 4420 | $_SESSION['login'], |
| 4421 | - 'at_del_file : ' . $data['name'] |
|
| 4421 | + 'at_del_file : '.$data['name'] |
|
| 4422 | 4422 | ); |
| 4423 | 4423 | |
| 4424 | 4424 | // DElete sharekeys |
@@ -4429,7 +4429,7 @@ discard block |
||
| 4429 | 4429 | ); |
| 4430 | 4430 | |
| 4431 | 4431 | // Delete file from server |
| 4432 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']), $SETTINGS); |
|
| 4432 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']), $SETTINGS); |
|
| 4433 | 4433 | } |
| 4434 | 4434 | |
| 4435 | 4435 | echo (string) prepareExchangedData( |
@@ -4448,7 +4448,7 @@ discard block |
||
| 4448 | 4448 | case 'clear_html_tags': |
| 4449 | 4449 | // Get information for this item |
| 4450 | 4450 | $dataItem = DB::queryfirstrow( |
| 4451 | - 'SELECT description FROM ' . prefixTable('items') . ' WHERE id=%i', |
|
| 4451 | + 'SELECT description FROM '.prefixTable('items').' WHERE id=%i', |
|
| 4452 | 4452 | filter_input(INPUT_POST, 'id_item', FILTER_SANITIZE_NUMBER_INT) |
| 4453 | 4453 | ); |
| 4454 | 4454 | // Clean up the string |
@@ -4486,12 +4486,12 @@ discard block |
||
| 4486 | 4486 | // Update SESSION with this new favourite |
| 4487 | 4487 | $data = DB::queryfirstrow( |
| 4488 | 4488 | 'SELECT label,id_tree |
| 4489 | - FROM ' . prefixTable('items') . ' |
|
| 4489 | + FROM ' . prefixTable('items').' |
|
| 4490 | 4490 | WHERE id = ' . mysqli_real_escape_string($link, $post_item_id) |
| 4491 | 4491 | ); |
| 4492 | 4492 | $_SESSION['favourites_tab'][$post_item_id] = array( |
| 4493 | 4493 | 'label' => $data['label'], |
| 4494 | - 'url' => 'index.php?page=items&group=' . $data['id_tree'] . '&id=' . $post_item_id, |
|
| 4494 | + 'url' => 'index.php?page=items&group='.$data['id_tree'].'&id='.$post_item_id, |
|
| 4495 | 4495 | ); |
| 4496 | 4496 | } elseif ((int) filter_input(INPUT_POST, 'action', FILTER_SANITIZE_NUMBER_INT) === 1) { |
| 4497 | 4497 | // delete from session |
@@ -4559,8 +4559,8 @@ discard block |
||
| 4559 | 4559 | // get data about item |
| 4560 | 4560 | $dataSource = DB::queryfirstrow( |
| 4561 | 4561 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 4562 | - FROM ' . prefixTable('items') . ' as i |
|
| 4563 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 4562 | + FROM ' . prefixTable('items').' as i |
|
| 4563 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 4564 | 4564 | WHERE i.id=%i', |
| 4565 | 4565 | $post_item_id |
| 4566 | 4566 | ); |
@@ -4568,7 +4568,7 @@ discard block |
||
| 4568 | 4568 | // get data about new folder |
| 4569 | 4569 | $dataDestination = DB::queryfirstrow( |
| 4570 | 4570 | 'SELECT personal_folder, title |
| 4571 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4571 | + FROM ' . prefixTable('nested_tree').' |
|
| 4572 | 4572 | WHERE id = %i', |
| 4573 | 4573 | $post_folder_id |
| 4574 | 4574 | ); |
@@ -4620,7 +4620,7 @@ discard block |
||
| 4620 | 4620 | // Get fields for this Item |
| 4621 | 4621 | $rows = DB::query( |
| 4622 | 4622 | 'SELECT id |
| 4623 | - FROM ' . prefixTable('categories_items') . ' |
|
| 4623 | + FROM ' . prefixTable('categories_items').' |
|
| 4624 | 4624 | WHERE item_id = %i', |
| 4625 | 4625 | $post_item_id |
| 4626 | 4626 | ); |
@@ -4637,7 +4637,7 @@ discard block |
||
| 4637 | 4637 | // Get FILES for this Item |
| 4638 | 4638 | $rows = DB::query( |
| 4639 | 4639 | 'SELECT id |
| 4640 | - FROM ' . prefixTable('files') . ' |
|
| 4640 | + FROM ' . prefixTable('files').' |
|
| 4641 | 4641 | WHERE id_item = %i', |
| 4642 | 4642 | $post_item_id |
| 4643 | 4643 | ); |
@@ -4682,7 +4682,7 @@ discard block |
||
| 4682 | 4682 | // Get the ITEM object key for the user |
| 4683 | 4683 | $userKey = DB::queryFirstRow( |
| 4684 | 4684 | 'SELECT share_key |
| 4685 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 4685 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 4686 | 4686 | WHERE user_id = %i AND object_id = %i', |
| 4687 | 4687 | $_SESSION['user_id'], |
| 4688 | 4688 | $post_item_id |
@@ -4693,8 +4693,8 @@ discard block |
||
| 4693 | 4693 | // This is a public object |
| 4694 | 4694 | $users = DB::query( |
| 4695 | 4695 | 'SELECT id, public_key |
| 4696 | - FROM ' . prefixTable('users') . ' |
|
| 4697 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 4696 | + FROM ' . prefixTable('users').' |
|
| 4697 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 4698 | 4698 | AND public_key != ""' |
| 4699 | 4699 | ); |
| 4700 | 4700 | foreach ($users as $user) { |
@@ -4714,14 +4714,14 @@ discard block |
||
| 4714 | 4714 | // Get fields for this Item |
| 4715 | 4715 | $rows = DB::query( |
| 4716 | 4716 | 'SELECT id |
| 4717 | - FROM ' . prefixTable('categories_items') . ' |
|
| 4717 | + FROM ' . prefixTable('categories_items').' |
|
| 4718 | 4718 | WHERE item_id = %i', |
| 4719 | 4719 | $post_item_id |
| 4720 | 4720 | ); |
| 4721 | 4721 | foreach ($rows as $field) { |
| 4722 | 4722 | $userKey = DB::queryFirstRow( |
| 4723 | 4723 | 'SELECT share_key |
| 4724 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 4724 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 4725 | 4725 | WHERE user_id = %i AND object_id = %i', |
| 4726 | 4726 | $_SESSION['user_id'], |
| 4727 | 4727 | $field['id'] |
@@ -4732,8 +4732,8 @@ discard block |
||
| 4732 | 4732 | // This is a public object |
| 4733 | 4733 | $users = DB::query( |
| 4734 | 4734 | 'SELECT id, public_key |
| 4735 | - FROM ' . prefixTable('users') . ' |
|
| 4736 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 4735 | + FROM ' . prefixTable('users').' |
|
| 4736 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 4737 | 4737 | AND public_key != ""' |
| 4738 | 4738 | ); |
| 4739 | 4739 | foreach ($users as $user) { |
@@ -4754,14 +4754,14 @@ discard block |
||
| 4754 | 4754 | // Get FILES for this Item |
| 4755 | 4755 | $rows = DB::query( |
| 4756 | 4756 | 'SELECT id |
| 4757 | - FROM ' . prefixTable('files') . ' |
|
| 4757 | + FROM ' . prefixTable('files').' |
|
| 4758 | 4758 | WHERE id_item = %i', |
| 4759 | 4759 | $post_item_id |
| 4760 | 4760 | ); |
| 4761 | 4761 | foreach ($rows as $attachment) { |
| 4762 | 4762 | $userKey = DB::queryFirstRow( |
| 4763 | 4763 | 'SELECT share_key |
| 4764 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 4764 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 4765 | 4765 | WHERE user_id = %i AND object_id = %i', |
| 4766 | 4766 | $_SESSION['user_id'], |
| 4767 | 4767 | $attachment['id'] |
@@ -4772,8 +4772,8 @@ discard block |
||
| 4772 | 4772 | // This is a public object |
| 4773 | 4773 | $users = DB::query( |
| 4774 | 4774 | 'SELECT id, public_key |
| 4775 | - FROM ' . prefixTable('users') . ' |
|
| 4776 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 4775 | + FROM ' . prefixTable('users').' |
|
| 4776 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 4777 | 4777 | AND public_key != ""' |
| 4778 | 4778 | ); |
| 4779 | 4779 | foreach ($users as $user) { |
@@ -4810,7 +4810,7 @@ discard block |
||
| 4810 | 4810 | $_SESSION['user_id'], |
| 4811 | 4811 | 'at_modification', |
| 4812 | 4812 | $_SESSION['login'], |
| 4813 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 4813 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 4814 | 4814 | ); |
| 4815 | 4815 | |
| 4816 | 4816 | $returnValues = array( |
@@ -4862,8 +4862,8 @@ discard block |
||
| 4862 | 4862 | // get data about item |
| 4863 | 4863 | $dataSource = DB::queryfirstrow( |
| 4864 | 4864 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 4865 | - FROM ' . prefixTable('items') . ' as i |
|
| 4866 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 4865 | + FROM ' . prefixTable('items').' as i |
|
| 4866 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 4867 | 4867 | WHERE i.id=%i', |
| 4868 | 4868 | $item_id |
| 4869 | 4869 | ); |
@@ -4885,7 +4885,7 @@ discard block |
||
| 4885 | 4885 | |
| 4886 | 4886 | // get data about new folder |
| 4887 | 4887 | $dataDestination = DB::queryfirstrow( |
| 4888 | - 'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 4888 | + 'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 4889 | 4889 | $post_folder_id |
| 4890 | 4890 | ); |
| 4891 | 4891 | |
@@ -4926,7 +4926,7 @@ discard block |
||
| 4926 | 4926 | // Get fields for this Item |
| 4927 | 4927 | $rows = DB::query( |
| 4928 | 4928 | 'SELECT id |
| 4929 | - FROM ' . prefixTable('categories_items') . ' |
|
| 4929 | + FROM ' . prefixTable('categories_items').' |
|
| 4930 | 4930 | WHERE item_id = %i', |
| 4931 | 4931 | $item_id |
| 4932 | 4932 | ); |
@@ -4943,7 +4943,7 @@ discard block |
||
| 4943 | 4943 | // Get FILES for this Item |
| 4944 | 4944 | $rows = DB::query( |
| 4945 | 4945 | 'SELECT id |
| 4946 | - FROM ' . prefixTable('files') . ' |
|
| 4946 | + FROM ' . prefixTable('files').' |
|
| 4947 | 4947 | WHERE id_item = %i', |
| 4948 | 4948 | $item_id |
| 4949 | 4949 | ); |
@@ -4996,7 +4996,7 @@ discard block |
||
| 4996 | 4996 | // Get the ITEM object key for the user |
| 4997 | 4997 | $userKey = DB::queryFirstRow( |
| 4998 | 4998 | 'SELECT share_key |
| 4999 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 4999 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5000 | 5000 | WHERE user_id = %i AND object_id = %i', |
| 5001 | 5001 | $_SESSION['user_id'], |
| 5002 | 5002 | $item_id |
@@ -5007,8 +5007,8 @@ discard block |
||
| 5007 | 5007 | // This is a public object |
| 5008 | 5008 | $users = DB::query( |
| 5009 | 5009 | 'SELECT id, public_key |
| 5010 | - FROM ' . prefixTable('users') . ' |
|
| 5011 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 5010 | + FROM ' . prefixTable('users').' |
|
| 5011 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 5012 | 5012 | AND public_key != ""' |
| 5013 | 5013 | ); |
| 5014 | 5014 | foreach ($users as $user) { |
@@ -5028,14 +5028,14 @@ discard block |
||
| 5028 | 5028 | // Get fields for this Item |
| 5029 | 5029 | $rows = DB::query( |
| 5030 | 5030 | 'SELECT id |
| 5031 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5031 | + FROM ' . prefixTable('categories_items').' |
|
| 5032 | 5032 | WHERE item_id = %i', |
| 5033 | 5033 | $item_id |
| 5034 | 5034 | ); |
| 5035 | 5035 | foreach ($rows as $field) { |
| 5036 | 5036 | $userKey = DB::queryFirstRow( |
| 5037 | 5037 | 'SELECT share_key |
| 5038 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5038 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5039 | 5039 | WHERE user_id = %i AND object_id = %i', |
| 5040 | 5040 | $_SESSION['user_id'], |
| 5041 | 5041 | $field['id'] |
@@ -5046,8 +5046,8 @@ discard block |
||
| 5046 | 5046 | // This is a public object |
| 5047 | 5047 | $users = DB::query( |
| 5048 | 5048 | 'SELECT id, public_key |
| 5049 | - FROM ' . prefixTable('users') . ' |
|
| 5050 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 5049 | + FROM ' . prefixTable('users').' |
|
| 5050 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 5051 | 5051 | AND public_key != ""' |
| 5052 | 5052 | ); |
| 5053 | 5053 | foreach ($users as $user) { |
@@ -5068,14 +5068,14 @@ discard block |
||
| 5068 | 5068 | // Get FILES for this Item |
| 5069 | 5069 | $rows = DB::query( |
| 5070 | 5070 | 'SELECT id |
| 5071 | - FROM ' . prefixTable('files') . ' |
|
| 5071 | + FROM ' . prefixTable('files').' |
|
| 5072 | 5072 | WHERE id_item = %i', |
| 5073 | 5073 | $item_id |
| 5074 | 5074 | ); |
| 5075 | 5075 | foreach ($rows as $attachment) { |
| 5076 | 5076 | $userKey = DB::queryFirstRow( |
| 5077 | 5077 | 'SELECT share_key |
| 5078 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5078 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5079 | 5079 | WHERE user_id = %i AND object_id = %i', |
| 5080 | 5080 | $_SESSION['user_id'], |
| 5081 | 5081 | $attachment['id'] |
@@ -5086,8 +5086,8 @@ discard block |
||
| 5086 | 5086 | // This is a public object |
| 5087 | 5087 | $users = DB::query( |
| 5088 | 5088 | 'SELECT id, public_key |
| 5089 | - FROM ' . prefixTable('users') . ' |
|
| 5090 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 5089 | + FROM ' . prefixTable('users').' |
|
| 5090 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 5091 | 5091 | AND public_key != ""' |
| 5092 | 5092 | ); |
| 5093 | 5093 | foreach ($users as $user) { |
@@ -5123,13 +5123,13 @@ discard block |
||
| 5123 | 5123 | $_SESSION['user_id'], |
| 5124 | 5124 | 'at_modification', |
| 5125 | 5125 | $_SESSION['login'], |
| 5126 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5126 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5127 | 5127 | ); |
| 5128 | 5128 | } |
| 5129 | 5129 | } |
| 5130 | 5130 | |
| 5131 | 5131 | // reload cache table |
| 5132 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 5132 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 5133 | 5133 | updateCacheTable('reload', $SETTINGS, ''); |
| 5134 | 5134 | |
| 5135 | 5135 | echo (string) prepareExchangedData( |
@@ -5192,7 +5192,7 @@ discard block |
||
| 5192 | 5192 | // get info |
| 5193 | 5193 | $dataSource = DB::queryfirstrow( |
| 5194 | 5194 | 'SELECT label, id_tree |
| 5195 | - FROM ' . prefixTable('items') . ' |
|
| 5195 | + FROM ' . prefixTable('items').' |
|
| 5196 | 5196 | WHERE id=%i', |
| 5197 | 5197 | $item_id |
| 5198 | 5198 | ); |
@@ -5291,8 +5291,8 @@ discard block |
||
| 5291 | 5291 | $content = explode(',', filter_input(INPUT_POST, 'content', FILTER_SANITIZE_STRING)); |
| 5292 | 5292 | } |
| 5293 | 5293 | // Variables |
| 5294 | - $dataAuthor = DB::queryfirstrow('SELECT email,login FROM ' . prefixTable('users') . ' WHERE id= ' . $content[1]); |
|
| 5295 | - $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM ' . prefixTable('items') . ' WHERE id= ' . $content[0]); |
|
| 5294 | + $dataAuthor = DB::queryfirstrow('SELECT email,login FROM '.prefixTable('users').' WHERE id= '.$content[1]); |
|
| 5295 | + $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM '.prefixTable('items').' WHERE id= '.$content[0]); |
|
| 5296 | 5296 | |
| 5297 | 5297 | // Get path |
| 5298 | 5298 | $path = geItemReadablePath( |
@@ -5306,7 +5306,7 @@ discard block |
||
| 5306 | 5306 | langHdl('email_request_access_subject'), |
| 5307 | 5307 | str_replace( |
| 5308 | 5308 | array('#tp_item_author#', '#tp_user#', '#tp_item#'), |
| 5309 | - array(' ' . addslashes($dataAuthor['login']), addslashes($_SESSION['login']), $path), |
|
| 5309 | + array(' '.addslashes($dataAuthor['login']), addslashes($_SESSION['login']), $path), |
|
| 5310 | 5310 | langHdl('email_request_access_mail') |
| 5311 | 5311 | ), |
| 5312 | 5312 | $dataAuthor['email'], |
@@ -5317,7 +5317,7 @@ discard block |
||
| 5317 | 5317 | } elseif ($post_cat === 'share_this_item') { |
| 5318 | 5318 | $dataItem = DB::queryfirstrow( |
| 5319 | 5319 | 'SELECT label,id_tree |
| 5320 | - FROM ' . prefixTable('items') . ' |
|
| 5320 | + FROM ' . prefixTable('items').' |
|
| 5321 | 5321 | WHERE id= %i', |
| 5322 | 5322 | $post_id |
| 5323 | 5323 | ); |
@@ -5341,7 +5341,7 @@ discard block |
||
| 5341 | 5341 | ), |
| 5342 | 5342 | array( |
| 5343 | 5343 | empty($SETTINGS['email_server_url']) === false ? |
| 5344 | - $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $post_id : $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $post_id, |
|
| 5344 | + $SETTINGS['email_server_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$post_id : $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$post_id, |
|
| 5345 | 5345 | addslashes($_SESSION['login']), |
| 5346 | 5346 | addslashes($path), |
| 5347 | 5347 | ), |
@@ -5376,7 +5376,7 @@ discard block |
||
| 5376 | 5376 | if (filter_input(INPUT_POST, 'notify_type', FILTER_SANITIZE_STRING) === 'on_show') { |
| 5377 | 5377 | // Check if values already exist |
| 5378 | 5378 | $data = DB::queryfirstrow( |
| 5379 | - 'SELECT notification FROM ' . prefixTable('items') . ' WHERE id = %i', |
|
| 5379 | + 'SELECT notification FROM '.prefixTable('items').' WHERE id = %i', |
|
| 5380 | 5380 | $post_item_id |
| 5381 | 5381 | ); |
| 5382 | 5382 | $notifiedUsers = explode(';', $data['notification']); |
@@ -5387,8 +5387,8 @@ discard block |
||
| 5387 | 5387 | prefixTable('items'), |
| 5388 | 5388 | array( |
| 5389 | 5389 | 'notification' => empty($data['notification']) ? |
| 5390 | - filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT) . ';' |
|
| 5391 | - : $data['notification'] . filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT), |
|
| 5390 | + filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT).';' |
|
| 5391 | + : $data['notification'].filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT), |
|
| 5392 | 5392 | ), |
| 5393 | 5393 | 'id=%i', |
| 5394 | 5394 | $post_item_id |
@@ -5403,7 +5403,7 @@ discard block |
||
| 5403 | 5403 | array( |
| 5404 | 5404 | 'notification' => empty($data['notification']) ? |
| 5405 | 5405 | filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT) |
| 5406 | - : $data['notification'] . ';' . filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT), |
|
| 5406 | + : $data['notification'].';'.filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT), |
|
| 5407 | 5407 | ), |
| 5408 | 5408 | 'id=%i', |
| 5409 | 5409 | $post_item_id |
@@ -5428,8 +5428,8 @@ discard block |
||
| 5428 | 5428 | // Get all informations for this item |
| 5429 | 5429 | $dataItem = DB::queryfirstrow( |
| 5430 | 5430 | 'SELECT * |
| 5431 | - FROM ' . prefixTable('items') . ' as i |
|
| 5432 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 5431 | + FROM ' . prefixTable('items').' as i |
|
| 5432 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 5433 | 5433 | WHERE i.id=%i AND l.action = %s', |
| 5434 | 5434 | $dataReceived['item_id'], |
| 5435 | 5435 | 'at_creation' |
@@ -5465,14 +5465,14 @@ discard block |
||
| 5465 | 5465 | ); |
| 5466 | 5466 | // Prepare new line |
| 5467 | 5467 | $data = DB::queryfirstrow( |
| 5468 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC', |
|
| 5468 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC', |
|
| 5469 | 5469 | $dataReceived['item_id'] |
| 5470 | 5470 | ); |
| 5471 | - $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $data['date']) . ' - ' . $_SESSION['login'] . ' - ' . langHdl($data['action']) . ' - ' . $data['raison']; |
|
| 5471 | + $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $data['date']).' - '.$_SESSION['login'].' - '.langHdl($data['action']).' - '.$data['raison']; |
|
| 5472 | 5472 | // send back |
| 5473 | 5473 | $data = array( |
| 5474 | 5474 | 'error' => '', |
| 5475 | - 'new_line' => '<br>' . addslashes($historic), |
|
| 5475 | + 'new_line' => '<br>'.addslashes($historic), |
|
| 5476 | 5476 | ); |
| 5477 | 5477 | echo (string) prepareExchangedData($data, 'encode'); |
| 5478 | 5478 | } else { |
@@ -5507,7 +5507,7 @@ discard block |
||
| 5507 | 5507 | */ |
| 5508 | 5508 | case 'is_item_changed': |
| 5509 | 5509 | $data = DB::queryFirstRow( |
| 5510 | - 'SELECT date FROM ' . prefixTable('log_items') . ' WHERE action = %s AND id_item = %i ORDER BY date DESC', |
|
| 5510 | + 'SELECT date FROM '.prefixTable('log_items').' WHERE action = %s AND id_item = %i ORDER BY date DESC', |
|
| 5511 | 5511 | 'at_modification', |
| 5512 | 5512 | $post_item_id |
| 5513 | 5513 | ); |
@@ -5531,7 +5531,7 @@ discard block |
||
| 5531 | 5531 | } |
| 5532 | 5532 | |
| 5533 | 5533 | // delete all existing old otv codes |
| 5534 | - $rows = DB::query('SELECT id FROM ' . prefixTable('otv') . ' WHERE timestamp < ' . (time() - $SETTINGS['otv_expiration_period'] * 86400)); |
|
| 5534 | + $rows = DB::query('SELECT id FROM '.prefixTable('otv').' WHERE timestamp < '.(time() - $SETTINGS['otv_expiration_period'] * 86400)); |
|
| 5535 | 5535 | foreach ($rows as $record) { |
| 5536 | 5536 | DB::delete(prefixTable('otv'), 'id=%i', $record['id']); |
| 5537 | 5537 | } |
@@ -5553,8 +5553,8 @@ discard block |
||
| 5553 | 5553 | // Should we log a password change? |
| 5554 | 5554 | $itemQ = DB::queryFirstRow( |
| 5555 | 5555 | 'SELECT s.share_key, i.pw |
| 5556 | - FROM ' . prefixTable('items') . ' AS i |
|
| 5557 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id) |
|
| 5556 | + FROM ' . prefixTable('items').' AS i |
|
| 5557 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id) |
|
| 5558 | 5558 | WHERE s.user_id = %i AND s.object_id = %i', |
| 5559 | 5559 | $_SESSION['user_id'], |
| 5560 | 5560 | $post_id |
@@ -5604,8 +5604,8 @@ discard block |
||
| 5604 | 5604 | if (isset($SETTINGS['otv_expiration_period']) === false) { |
| 5605 | 5605 | $SETTINGS['otv_expiration_period'] = 7; |
| 5606 | 5606 | } |
| 5607 | - $url = $SETTINGS['cpassman_url'] . '/index.php?otv=true&' . http_build_query($otv_session); |
|
| 5608 | - $exp_date = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], time() + (intval($SETTINGS['otv_expiration_period']) * 86400)); |
|
| 5607 | + $url = $SETTINGS['cpassman_url'].'/index.php?otv=true&'.http_build_query($otv_session); |
|
| 5608 | + $exp_date = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], time() + (intval($SETTINGS['otv_expiration_period']) * 86400)); |
|
| 5609 | 5609 | |
| 5610 | 5610 | echo json_encode( |
| 5611 | 5611 | array( |
@@ -5642,8 +5642,8 @@ discard block |
||
| 5642 | 5642 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, |
| 5643 | 5643 | f.extension AS extension, f.type AS type, |
| 5644 | 5644 | s.share_key AS share_key |
| 5645 | - FROM ' . prefixTable('files') . ' AS f |
|
| 5646 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 5645 | + FROM ' . prefixTable('files').' AS f |
|
| 5646 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 5647 | 5647 | WHERE s.user_id = %i AND s.object_id = %i', |
| 5648 | 5648 | $_SESSION['user_id'], |
| 5649 | 5649 | $post_id |
@@ -5664,7 +5664,7 @@ discard block |
||
| 5664 | 5664 | //$fileName = basename($file_info['name'], '.'.$file_info['extension']); |
| 5665 | 5665 | |
| 5666 | 5666 | // prepare image info |
| 5667 | - $post_title = basename($file_info['name'], '.' . $file_info['extension']); |
|
| 5667 | + $post_title = basename($file_info['name'], '.'.$file_info['extension']); |
|
| 5668 | 5668 | $post_title = isBase64($post_title) === true ? |
| 5669 | 5669 | base64_decode($post_title) : $post_title; |
| 5670 | 5670 | $image_code = $file_info['file']; |
@@ -5681,7 +5681,7 @@ discard block |
||
| 5681 | 5681 | echo (string) prepareExchangedData( |
| 5682 | 5682 | array( |
| 5683 | 5683 | 'error' => false, |
| 5684 | - 'filename' => $post_title . '.' . $file_info['extension'], |
|
| 5684 | + 'filename' => $post_title.'.'.$file_info['extension'], |
|
| 5685 | 5685 | 'file_type' => $file_info['type'], |
| 5686 | 5686 | 'file_content' => $fileContent, |
| 5687 | 5687 | ), |
@@ -5702,11 +5702,11 @@ discard block |
||
| 5702 | 5702 | |
| 5703 | 5703 | // get file info |
| 5704 | 5704 | $result = DB::queryfirstrow( |
| 5705 | - 'SELECT file FROM ' . prefixTable('files') . ' WHERE id=%i', |
|
| 5705 | + 'SELECT file FROM '.prefixTable('files').' WHERE id=%i', |
|
| 5706 | 5706 | intval(substr(filter_input(INPUT_POST, 'uri', FILTER_SANITIZE_STRING), 1)) |
| 5707 | 5707 | ); |
| 5708 | 5708 | |
| 5709 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $result['file'] . filter_input(INPUT_POST, 'file_suffix', FILTER_SANITIZE_STRING), $SETTINGS); |
|
| 5709 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.$result['file'].filter_input(INPUT_POST, 'file_suffix', FILTER_SANITIZE_STRING), $SETTINGS); |
|
| 5710 | 5710 | |
| 5711 | 5711 | break; |
| 5712 | 5712 | |
@@ -5730,16 +5730,16 @@ discard block |
||
| 5730 | 5730 | $idFolder = $dataReceived['idFolder']; |
| 5731 | 5731 | |
| 5732 | 5732 | // don't check if Personal Folder |
| 5733 | - $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $idFolder); |
|
| 5733 | + $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $idFolder); |
|
| 5734 | 5734 | if ($data['title'] == $_SESSION['user_id']) { |
| 5735 | 5735 | // send data |
| 5736 | - echo '[{"duplicate" : "' . $duplicate . '" , error" : ""}]'; |
|
| 5736 | + echo '[{"duplicate" : "'.$duplicate.'" , error" : ""}]'; |
|
| 5737 | 5737 | } else { |
| 5738 | 5738 | if (filter_input(INPUT_POST, 'option', FILTER_SANITIZE_STRING) === 'same_folder') { |
| 5739 | 5739 | // case unique folder |
| 5740 | 5740 | DB::query( |
| 5741 | 5741 | 'SELECT label |
| 5742 | - FROM ' . prefixTable('items') . ' |
|
| 5742 | + FROM ' . prefixTable('items').' |
|
| 5743 | 5743 | WHERE id_tree = %i AND label = %s', |
| 5744 | 5744 | $idFolder, |
| 5745 | 5745 | $label |
@@ -5752,7 +5752,7 @@ discard block |
||
| 5752 | 5752 | $listPf = ''; |
| 5753 | 5753 | if (empty($row['id']) === false) { |
| 5754 | 5754 | $rows = DB::query( |
| 5755 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 5755 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 5756 | 5756 | '1' |
| 5757 | 5757 | ); |
| 5758 | 5758 | foreach ($rows as $record) { |
@@ -5767,12 +5767,12 @@ discard block |
||
| 5767 | 5767 | $where->add('id_tree = %i', $idFolder); |
| 5768 | 5768 | $where->add('label = %s', $label); |
| 5769 | 5769 | if (empty($arrayPf) === false) { |
| 5770 | - $where->add('id_tree NOT IN (' . implode(',', $arrayPf) . ')'); |
|
| 5770 | + $where->add('id_tree NOT IN ('.implode(',', $arrayPf).')'); |
|
| 5771 | 5771 | } |
| 5772 | 5772 | |
| 5773 | 5773 | DB::query( |
| 5774 | 5774 | 'SELECT label |
| 5775 | - FROM ' . prefixTable('items') . ' |
|
| 5775 | + FROM ' . prefixTable('items').' |
|
| 5776 | 5776 | WHERE %l', |
| 5777 | 5777 | $where |
| 5778 | 5778 | ); |
@@ -5784,7 +5784,7 @@ discard block |
||
| 5784 | 5784 | } |
| 5785 | 5785 | |
| 5786 | 5786 | // send data |
| 5787 | - echo '[{"duplicate" : "' . $duplicate . '" , "error" : ""}]'; |
|
| 5787 | + echo '[{"duplicate" : "'.$duplicate.'" , "error" : ""}]'; |
|
| 5788 | 5788 | } |
| 5789 | 5789 | break; |
| 5790 | 5790 | |
@@ -5840,7 +5840,7 @@ discard block |
||
| 5840 | 5840 | } |
| 5841 | 5841 | |
| 5842 | 5842 | //Build tree |
| 5843 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 5843 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 5844 | 5844 | $tree->register(); |
| 5845 | 5845 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 5846 | 5846 | $tree->rebuild(); |
@@ -5902,7 +5902,7 @@ discard block |
||
| 5902 | 5902 | if (empty($arr_data['folders'][$inc]['path']) === true) { |
| 5903 | 5903 | $arr_data['folders'][$inc]['path'] = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
| 5904 | 5904 | } else { |
| 5905 | - $arr_data['folders'][$inc]['path'] .= ' / ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 5905 | + $arr_data['folders'][$inc]['path'] .= ' / '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 5906 | 5906 | } |
| 5907 | 5907 | } |
| 5908 | 5908 | |
@@ -5968,8 +5968,8 @@ discard block |
||
| 5968 | 5968 | $rows_tmp = DB::query( |
| 5969 | 5969 | 'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory, |
| 5970 | 5970 | f.id_category AS category_id |
| 5971 | - FROM ' . prefixTable('categories_folders') . ' AS f |
|
| 5972 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id) |
|
| 5971 | + FROM ' . prefixTable('categories_folders').' AS f |
|
| 5972 | + INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id) |
|
| 5973 | 5973 | WHERE id_folder=%i', |
| 5974 | 5974 | $folder |
| 5975 | 5975 | ); |
@@ -5996,7 +5996,7 @@ discard block |
||
| 5996 | 5996 | $valTemp = ''; |
| 5997 | 5997 | $data = DB::queryFirstRow( |
| 5998 | 5998 | 'SELECT valeur |
| 5999 | - FROM ' . prefixTable('misc') . ' |
|
| 5999 | + FROM ' . prefixTable('misc').' |
|
| 6000 | 6000 | WHERE type = %s AND intitule=%i', |
| 6001 | 6001 | 'complex', |
| 6002 | 6002 | $folder |
@@ -6013,14 +6013,14 @@ discard block |
||
| 6013 | 6013 | $valTemp = ''; |
| 6014 | 6014 | $rows_tmp = DB::query( |
| 6015 | 6015 | 'SELECT t.title |
| 6016 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 6017 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 6016 | + FROM ' . prefixTable('roles_values').' as v |
|
| 6017 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 6018 | 6018 | WHERE v.folder_id = %i |
| 6019 | 6019 | GROUP BY title', |
| 6020 | 6020 | $folder |
| 6021 | 6021 | ); |
| 6022 | 6022 | foreach ($rows_tmp as $record) { |
| 6023 | - $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title']; |
|
| 6023 | + $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title']; |
|
| 6024 | 6024 | } |
| 6025 | 6025 | $arr_data[$folder]['visibilityRoles'] = $valTemp; |
| 6026 | 6026 | } |
@@ -6048,7 +6048,7 @@ discard block |
||
| 6048 | 6048 | // get item info |
| 6049 | 6049 | $dataItem = DB::queryFirstRow( |
| 6050 | 6050 | 'SELECT * |
| 6051 | - FROM ' . prefixTable('items') . ' |
|
| 6051 | + FROM ' . prefixTable('items').' |
|
| 6052 | 6052 | WHERE id=%i', |
| 6053 | 6053 | $post_item_id |
| 6054 | 6054 | ); |
@@ -6058,8 +6058,8 @@ discard block |
||
| 6058 | 6058 | $rows = DB::query( |
| 6059 | 6059 | 'SELECT l.date as date, l.action as action, l.raison as raison, l.raison_iv AS raison_iv, |
| 6060 | 6060 | u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname |
| 6061 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 6062 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 6061 | + FROM ' . prefixTable('log_items').' as l |
|
| 6062 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 6063 | 6063 | WHERE id_item=%i AND action <> %s |
| 6064 | 6064 | ORDER BY date DESC', |
| 6065 | 6065 | $post_item_id, |
@@ -6073,7 +6073,7 @@ discard block |
||
| 6073 | 6073 | } |
| 6074 | 6074 | // imported via API |
| 6075 | 6075 | if (empty($record['login'])) { |
| 6076 | - $record['login'] = langHdl('imported_via_api') . ' [' . $record['raison'] . ']'; |
|
| 6076 | + $record['login'] = langHdl('imported_via_api').' ['.$record['raison'].']'; |
|
| 6077 | 6077 | } |
| 6078 | 6078 | |
| 6079 | 6079 | if ( |
@@ -6084,13 +6084,13 @@ discard block |
||
| 6084 | 6084 | ) { |
| 6085 | 6085 | // Prepare avatar |
| 6086 | 6086 | if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) { |
| 6087 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) { |
|
| 6088 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb']; |
|
| 6087 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) { |
|
| 6088 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb']; |
|
| 6089 | 6089 | } else { |
| 6090 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6090 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6091 | 6091 | } |
| 6092 | 6092 | } else { |
| 6093 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6093 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6094 | 6094 | } |
| 6095 | 6095 | |
| 6096 | 6096 | // Prepare action |
@@ -6107,19 +6107,19 @@ discard block |
||
| 6107 | 6107 | $action = langHdl($reason[0]); |
| 6108 | 6108 | if ($reason[0] === 'at_moved') { |
| 6109 | 6109 | $tmp = explode(' -> ', $reason[1]); |
| 6110 | - $detail = langHdl('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . langHdl('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>'; |
|
| 6110 | + $detail = langHdl('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.langHdl('to').' <span class="font-weight-light">'.$tmp[1].' </span>'; |
|
| 6111 | 6111 | } elseif ($reason[0] === 'at_field') { |
| 6112 | 6112 | $tmp = explode(' => ', $reason[1]); |
| 6113 | 6113 | if (count($tmp) > 1) { |
| 6114 | - $detail = '<b>' . trim($tmp[0]) . '</b> | ' . langHdl('previous_value') . |
|
| 6115 | - ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>'; |
|
| 6114 | + $detail = '<b>'.trim($tmp[0]).'</b> | '.langHdl('previous_value'). |
|
| 6115 | + ': <span class="font-weight-light">'.trim($tmp[1]).'</span>'; |
|
| 6116 | 6116 | } else { |
| 6117 | 6117 | $detail = trim($reason[1]); |
| 6118 | 6118 | } |
| 6119 | 6119 | } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url')) === true) { |
| 6120 | 6120 | $tmp = explode(' => ', $reason[1]); |
| 6121 | 6121 | $detail = empty(trim($tmp[0])) === true ? |
| 6122 | - langHdl('no_previous_value') : langHdl('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>'; |
|
| 6122 | + langHdl('no_previous_value') : langHdl('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>'; |
|
| 6123 | 6123 | } elseif ($reason[0] === 'at_automatic_del') { |
| 6124 | 6124 | $detail = langHdl($reason[1]); |
| 6125 | 6125 | } elseif ($reason[0] === 'at_anyoneconmodify') { |
@@ -6128,7 +6128,7 @@ discard block |
||
| 6128 | 6128 | $tmp = explode(':', $reason[1]); |
| 6129 | 6129 | $tmp = explode('.', $tmp[0]); |
| 6130 | 6130 | $detail = isBase64($tmp[0]) === true ? |
| 6131 | - base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0]; |
|
| 6131 | + base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0]; |
|
| 6132 | 6132 | } elseif ($reason[0] === 'at_import') { |
| 6133 | 6133 | $detail = ''; |
| 6134 | 6134 | } elseif (in_array($reason[0], array('csv', 'pdf')) === true) { |
@@ -6147,8 +6147,8 @@ discard block |
||
| 6147 | 6147 | array( |
| 6148 | 6148 | 'avatar' => $avatar, |
| 6149 | 6149 | 'login' => $record['login'], |
| 6150 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
| 6151 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $record['date']), |
|
| 6150 | + 'name' => $record['name'].' '.$record['lastname'], |
|
| 6151 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $record['date']), |
|
| 6152 | 6152 | 'action' => $action, |
| 6153 | 6153 | 'detail' => $detail, |
| 6154 | 6154 | ) |
@@ -6231,18 +6231,18 @@ discard block |
||
| 6231 | 6231 | |
| 6232 | 6232 | // get some info to add to the notification email |
| 6233 | 6233 | $resp_user = DB::queryfirstrow( |
| 6234 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
| 6234 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
| 6235 | 6235 | $_SESSION['user_id'] |
| 6236 | 6236 | ); |
| 6237 | 6237 | $resp_folder = DB::queryfirstrow( |
| 6238 | - 'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 6238 | + 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 6239 | 6239 | $folder |
| 6240 | 6240 | ); |
| 6241 | 6241 | |
| 6242 | 6242 | // notify Managers |
| 6243 | 6243 | $rows = DB::query( |
| 6244 | 6244 | 'SELECT email |
| 6245 | - FROM ' . prefixTable('users') . ' |
|
| 6245 | + FROM ' . prefixTable('users').' |
|
| 6246 | 6246 | WHERE `gestionnaire` = %i AND `email` IS NOT NULL', |
| 6247 | 6247 | 1 |
| 6248 | 6248 | ); |
@@ -6273,14 +6273,14 @@ discard block |
||
| 6273 | 6273 | // Get list of users |
| 6274 | 6274 | $usersList = array(); |
| 6275 | 6275 | $usersString = ''; |
| 6276 | - $rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC'); |
|
| 6276 | + $rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC'); |
|
| 6277 | 6277 | foreach ($rows as $record) { |
| 6278 | 6278 | $usersList[$record['login']] = array( |
| 6279 | 6279 | 'id' => $record['id'], |
| 6280 | 6280 | 'login' => $record['login'], |
| 6281 | 6281 | 'email' => $record['email'], |
| 6282 | 6282 | ); |
| 6283 | - $usersString .= $record['id'] . '#' . $record['login'] . ';'; |
|
| 6283 | + $usersString .= $record['id'].'#'.$record['login'].';'; |
|
| 6284 | 6284 | } |
| 6285 | 6285 | |
| 6286 | 6286 | $data = array( |
@@ -6314,20 +6314,20 @@ discard block |
||
| 6314 | 6314 | // Send email |
| 6315 | 6315 | $dataItem = DB::queryfirstrow( |
| 6316 | 6316 | 'SELECT label, id_tree |
| 6317 | - FROM ' . prefixTable('items') . ' |
|
| 6317 | + FROM ' . prefixTable('items').' |
|
| 6318 | 6318 | WHERE id = %i', |
| 6319 | 6319 | $post_item_id |
| 6320 | 6320 | ); |
| 6321 | 6321 | $dataItemLog = DB::queryfirstrow( |
| 6322 | 6322 | 'SELECT id_user |
| 6323 | - FROM ' . prefixTable('log_items') . ' |
|
| 6323 | + FROM ' . prefixTable('log_items').' |
|
| 6324 | 6324 | WHERE id_item = %i AND action = %s', |
| 6325 | 6325 | $post_item_id, |
| 6326 | 6326 | 'at_creation' |
| 6327 | 6327 | ); |
| 6328 | 6328 | $dataAuthor = DB::queryfirstrow( |
| 6329 | 6329 | 'SELECT email, login |
| 6330 | - FROM ' . prefixTable('users') . ' |
|
| 6330 | + FROM ' . prefixTable('users').' |
|
| 6331 | 6331 | WHERE id = %i', |
| 6332 | 6332 | $dataItemLog['id_user'] |
| 6333 | 6333 | ); |
@@ -6406,7 +6406,7 @@ discard block |
||
| 6406 | 6406 | |
| 6407 | 6407 | DB::query( |
| 6408 | 6408 | 'SELECT * |
| 6409 | - FROM ' . prefixTable('notification') . ' |
|
| 6409 | + FROM ' . prefixTable('notification').' |
|
| 6410 | 6410 | WHERE item_id = %i AND user_id = %i', |
| 6411 | 6411 | $post_item_id, |
| 6412 | 6412 | $_SESSION['user_id'] |
@@ -6472,7 +6472,7 @@ discard block |
||
| 6472 | 6472 | // And related logs |
| 6473 | 6473 | $rows = DB::query( |
| 6474 | 6474 | 'SELECT id, file AS filename |
| 6475 | - FROM ' . prefixTable('files') . ' |
|
| 6475 | + FROM ' . prefixTable('files').' |
|
| 6476 | 6476 | WHERE id_item = %i AND confirmed = %i', |
| 6477 | 6477 | $post_item_id, |
| 6478 | 6478 | 0 |
@@ -6486,12 +6486,12 @@ discard block |
||
| 6486 | 6486 | ); |
| 6487 | 6487 | |
| 6488 | 6488 | // Delete file on server |
| 6489 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename'])); |
|
| 6489 | + unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename'])); |
|
| 6490 | 6490 | |
| 6491 | 6491 | // Delete related logs |
| 6492 | 6492 | $logFile = DB::query( |
| 6493 | 6493 | 'SELECT increment_id, raison |
| 6494 | - FROM ' . prefixTable('log_items') . ' |
|
| 6494 | + FROM ' . prefixTable('log_items').' |
|
| 6495 | 6495 | WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"', |
| 6496 | 6496 | $post_item_id, |
| 6497 | 6497 | $_SESSION['user_id'], |
@@ -6544,7 +6544,7 @@ discard block |
||
| 6544 | 6544 | // Confirm attachments |
| 6545 | 6545 | $rows = DB::query( |
| 6546 | 6546 | 'SELECT id, file AS filename |
| 6547 | - FROM ' . prefixTable('files') . ' |
|
| 6547 | + FROM ' . prefixTable('files').' |
|
| 6548 | 6548 | WHERE id_item = %i AND confirmed = %i', |
| 6549 | 6549 | $post_item_id, |
| 6550 | 6550 | 0 |
@@ -6581,15 +6581,15 @@ discard block |
||
| 6581 | 6581 | case 'autocomplete_tags': |
| 6582 | 6582 | // Get a list off all existing TAGS |
| 6583 | 6583 | $listOfTags = ''; |
| 6584 | - $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $_GET['term']); |
|
| 6584 | + $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $_GET['term']); |
|
| 6585 | 6585 | foreach ($rows as $record) { |
| 6586 | 6586 | if (empty($listOfTags)) { |
| 6587 | - $listOfTags = '"' . $record['tag'] . '"'; |
|
| 6587 | + $listOfTags = '"'.$record['tag'].'"'; |
|
| 6588 | 6588 | } else { |
| 6589 | - $listOfTags .= ', "' . $record['tag'] . '"'; |
|
| 6589 | + $listOfTags .= ', "'.$record['tag'].'"'; |
|
| 6590 | 6590 | } |
| 6591 | 6591 | } |
| 6592 | - echo '[' . $listOfTags . ']'; |
|
| 6592 | + echo '['.$listOfTags.']'; |
|
| 6593 | 6593 | break; |
| 6594 | 6594 | } |
| 6595 | 6595 | } |
@@ -6602,7 +6602,7 @@ discard block |
||
| 6602 | 6602 | { |
| 6603 | 6603 | $data = DB::queryFirstRow( |
| 6604 | 6604 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 6605 | - FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 6605 | + FROM ' . prefixTable('nested_tree').' WHERE id = %i', |
|
| 6606 | 6606 | $groupe |
| 6607 | 6607 | ); |
| 6608 | 6608 | // Check if it's in a personal folder. If yes, then force complexity overhead. |
