@@ -37,12 +37,12 @@ discard block |
||
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | // Do checks |
| 40 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 41 | -require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php'; |
|
| 40 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 41 | +require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
|
| 42 | 42 | if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'folders', $SETTINGS) === false) { |
| 43 | 43 | // Not allowed page |
| 44 | 44 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 45 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 45 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 46 | 46 | exit(); |
| 47 | 47 | } |
| 48 | 48 | |
@@ -55,14 +55,14 @@ discard block |
||
| 55 | 55 | date_default_timezone_set('UTC'); |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 58 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 59 | 59 | header('Content-type: text/html; charset=utf-8'); |
| 60 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user']['user_language'] . '.php'; |
|
| 61 | -require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 62 | -require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 60 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user']['user_language'].'.php'; |
|
| 61 | +require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 62 | +require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 63 | 63 | |
| 64 | 64 | // Connect to mysql server |
| 65 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 65 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 66 | 66 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 67 | 67 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 68 | 68 | } |
@@ -132,14 +132,14 @@ discard block |
||
| 132 | 132 | && $t->personal_folder == 0 |
| 133 | 133 | ) { |
| 134 | 134 | // get $t->parent_id |
| 135 | - $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $t->parent_id); |
|
| 135 | + $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $t->parent_id); |
|
| 136 | 136 | if ($t->nlevel == 1) { |
| 137 | 137 | $data['title'] = langHdl('root'); |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | // get rights on this folder |
| 141 | 141 | $arrayRights = array(); |
| 142 | - $rows = DB::query('SELECT fonction_id FROM ' . prefixTable('rights') . ' WHERE authorized=%i AND tree_id = %i', 1, $t->id); |
|
| 142 | + $rows = DB::query('SELECT fonction_id FROM '.prefixTable('rights').' WHERE authorized=%i AND tree_id = %i', 1, $t->id); |
|
| 143 | 143 | foreach ($rows as $record) { |
| 144 | 144 | array_push($arrayRights, $record['fonction_id']); |
| 145 | 145 | } |
@@ -157,8 +157,8 @@ discard block |
||
| 157 | 157 | 'SELECT m.valeur AS valeur, n.renewal_period AS renewal_period, |
| 158 | 158 | n.bloquer_creation AS bloquer_creation, n.bloquer_modification AS bloquer_modification, |
| 159 | 159 | n.fa_icon, n.fa_icon_selected |
| 160 | - FROM ' . prefixTable('misc') . ' AS m, |
|
| 161 | - ' . prefixTable('nested_tree') . ' AS n |
|
| 160 | + FROM ' . prefixTable('misc').' AS m, |
|
| 161 | + ' . prefixTable('nested_tree').' AS n |
|
| 162 | 162 | WHERE m.type=%s AND m.intitule = n.id AND m.intitule = %i', |
| 163 | 163 | 'complex', |
| 164 | 164 | $t->id |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | //col7 |
| 192 | 192 | $data7 = DB::queryFirstRow( |
| 193 | 193 | 'SELECT bloquer_creation,bloquer_modification |
| 194 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 194 | + FROM ' . prefixTable('nested_tree').' |
|
| 195 | 195 | WHERE id = %i', |
| 196 | 196 | intval($t->id) |
| 197 | 197 | ); |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | |
| 304 | 304 | // decrypt and retrieve data in JSON format |
| 305 | 305 | $dataReceived = prepareExchangedData( |
| 306 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 306 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 307 | 307 | |
| 308 | 308 | // prepare variables |
| 309 | 309 | $post_title = filter_var($dataReceived['title'], FILTER_SANITIZE_STRING); |
@@ -336,7 +336,7 @@ discard block |
||
| 336 | 336 | // Get info about this folder |
| 337 | 337 | $dataFolder = DB::queryfirstrow( |
| 338 | 338 | 'SELECT * |
| 339 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 339 | + FROM ' . prefixTable('nested_tree').' |
|
| 340 | 340 | WHERE id = %i', |
| 341 | 341 | $post_folder_id |
| 342 | 342 | ); |
@@ -373,7 +373,7 @@ discard block |
||
| 373 | 373 | //check if parent folder is personal |
| 374 | 374 | $dataParent = DB::queryfirstrow( |
| 375 | 375 | 'SELECT personal_folder, bloquer_creation, bloquer_modification |
| 376 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 376 | + FROM ' . prefixTable('nested_tree').' |
|
| 377 | 377 | WHERE id = %i', |
| 378 | 378 | $post_parent_id |
| 379 | 379 | ); |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | // get complexity level for this folder |
| 403 | 403 | $data = DB::queryfirstrow( |
| 404 | 404 | 'SELECT valeur |
| 405 | - FROM ' . prefixTable('misc') . ' |
|
| 405 | + FROM ' . prefixTable('misc').' |
|
| 406 | 406 | WHERE intitule = %i AND type = %s', |
| 407 | 407 | $post_parent_id, |
| 408 | 408 | 'complex' |
@@ -414,7 +414,7 @@ discard block |
||
| 414 | 414 | array( |
| 415 | 415 | 'error' => true, |
| 416 | 416 | 'message' => langHdl('error_folder_complexity_lower_than_top_folder') |
| 417 | - . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]', |
|
| 417 | + . ' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]', |
|
| 418 | 418 | ), |
| 419 | 419 | 'encode' |
| 420 | 420 | ); |
@@ -525,7 +525,7 @@ discard block |
||
| 525 | 525 | |
| 526 | 526 | // decrypt and retrieve data in JSON format |
| 527 | 527 | $dataReceived = prepareExchangedData( |
| 528 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 528 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 529 | 529 | |
| 530 | 530 | // prepare variables |
| 531 | 531 | $post_title = filter_var($dataReceived['title'], FILTER_SANITIZE_STRING); |
@@ -591,7 +591,7 @@ discard block |
||
| 591 | 591 | ) { |
| 592 | 592 | DB::query( |
| 593 | 593 | 'SELECT * |
| 594 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 594 | + FROM ' . prefixTable('nested_tree').' |
|
| 595 | 595 | WHERE title = %s', |
| 596 | 596 | $post_title |
| 597 | 597 | ); |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | //check if parent folder is personal |
| 613 | 613 | $data = DB::queryfirstrow( |
| 614 | 614 | 'SELECT personal_folder, bloquer_creation, bloquer_modification |
| 615 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 615 | + FROM ' . prefixTable('nested_tree').' |
|
| 616 | 616 | WHERE id = %i', |
| 617 | 617 | $post_parent_id |
| 618 | 618 | ); |
@@ -641,7 +641,7 @@ discard block |
||
| 641 | 641 | // get complexity level for this folder |
| 642 | 642 | $data = DB::queryfirstrow( |
| 643 | 643 | 'SELECT valeur |
| 644 | - FROM ' . prefixTable('misc') . ' |
|
| 644 | + FROM ' . prefixTable('misc').' |
|
| 645 | 645 | WHERE intitule = %i AND type = %s', |
| 646 | 646 | $post_parent_id, |
| 647 | 647 | 'complex' |
@@ -652,7 +652,7 @@ discard block |
||
| 652 | 652 | array( |
| 653 | 653 | 'error' => true, |
| 654 | 654 | 'message' => langHdl('error_folder_complexity_lower_than_top_folder') |
| 655 | - . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]', |
|
| 655 | + . ' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]', |
|
| 656 | 656 | ), |
| 657 | 657 | 'encode' |
| 658 | 658 | ); |
@@ -745,7 +745,7 @@ discard block |
||
| 745 | 745 | && (int) $SETTINGS['subfolder_rights_as_parent'] === 1 |
| 746 | 746 | ) { |
| 747 | 747 | //If it is a subfolder, then give access to it for all roles that allows the parent folder |
| 748 | - $rows = DB::query('SELECT role_id, type FROM ' . prefixTable('roles_values') . ' WHERE folder_id = %i', $post_parent_id); |
|
| 748 | + $rows = DB::query('SELECT role_id, type FROM '.prefixTable('roles_values').' WHERE folder_id = %i', $post_parent_id); |
|
| 749 | 749 | foreach ($rows as $record) { |
| 750 | 750 | //add access to this subfolder |
| 751 | 751 | DB::insert( |
@@ -760,7 +760,7 @@ discard block |
||
| 760 | 760 | } |
| 761 | 761 | |
| 762 | 762 | // if parent folder has Custom Fields Categories then add to this child one too |
| 763 | - $rows = DB::query('SELECT id_category FROM ' . prefixTable('categories_folders') . ' WHERE id_folder = %i', $post_parent_id); |
|
| 763 | + $rows = DB::query('SELECT id_category FROM '.prefixTable('categories_folders').' WHERE id_folder = %i', $post_parent_id); |
|
| 764 | 764 | foreach ($rows as $record) { |
| 765 | 765 | //add CF Category to this subfolder |
| 766 | 766 | DB::insert( |
@@ -844,17 +844,17 @@ discard block |
||
| 844 | 844 | prefixTable('misc'), |
| 845 | 845 | array( |
| 846 | 846 | 'type' => 'folder_deleted', |
| 847 | - 'intitule' => 'f' . $thisSubFolders->id, |
|
| 848 | - 'valeur' => $thisSubFolders->id . ', ' . $thisSubFolders->parent_id . ', ' . |
|
| 849 | - $thisSubFolders->title . ', ' . $thisSubFolders->nleft . ', ' . $thisSubFolders->nright . ', ' . |
|
| 850 | - $thisSubFolders->nlevel . ', 0, 0, 0, 0', |
|
| 847 | + 'intitule' => 'f'.$thisSubFolders->id, |
|
| 848 | + 'valeur' => $thisSubFolders->id.', '.$thisSubFolders->parent_id.', '. |
|
| 849 | + $thisSubFolders->title.', '.$thisSubFolders->nleft.', '.$thisSubFolders->nright.', '. |
|
| 850 | + $thisSubFolders->nlevel.', 0, 0, 0, 0', |
|
| 851 | 851 | ) |
| 852 | 852 | ); |
| 853 | 853 | //array for delete folder |
| 854 | 854 | $folderForDel[] = $thisSubFolders->id; |
| 855 | 855 | |
| 856 | 856 | //delete items & logs |
| 857 | - $itemsInSubFolder = DB::query('SELECT id FROM ' . prefixTable('items') . ' WHERE id_tree=%i', $thisSubFolders->id); |
|
| 857 | + $itemsInSubFolder = DB::query('SELECT id FROM '.prefixTable('items').' WHERE id_tree=%i', $thisSubFolders->id); |
|
| 858 | 858 | foreach ($itemsInSubFolder as $item) { |
| 859 | 859 | DB::update( |
| 860 | 860 | prefixTable('items'), |
@@ -906,7 +906,7 @@ discard block |
||
| 906 | 906 | $tree->rebuild(); |
| 907 | 907 | |
| 908 | 908 | // reload cache table |
| 909 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 909 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 910 | 910 | updateCacheTable('reload', $SETTINGS, null); |
| 911 | 911 | |
| 912 | 912 | // Update timestamp |
@@ -1011,7 +1011,7 @@ discard block |
||
| 1011 | 1011 | // get complexity of current node |
| 1012 | 1012 | $nodeComplexity = DB::queryfirstrow( |
| 1013 | 1013 | 'SELECT valeur |
| 1014 | - FROM ' . prefixTable('misc') . ' |
|
| 1014 | + FROM ' . prefixTable('misc').' |
|
| 1015 | 1015 | WHERE intitule = %i AND type= %s', |
| 1016 | 1016 | $nodeInfo->id, |
| 1017 | 1017 | 'complex' |
@@ -1087,7 +1087,7 @@ discard block |
||
| 1087 | 1087 | // If it is a subfolder, then give access to it for all roles that allows the parent folder |
| 1088 | 1088 | $rows = DB::query( |
| 1089 | 1089 | 'SELECT role_id, type |
| 1090 | - FROM ' . prefixTable('roles_values') . ' |
|
| 1090 | + FROM ' . prefixTable('roles_values').' |
|
| 1091 | 1091 | WHERE folder_id = %i', |
| 1092 | 1092 | $parentId |
| 1093 | 1093 | ); |
@@ -1095,7 +1095,7 @@ discard block |
||
| 1095 | 1095 | // Add access to this subfolder after checking that it is not already set |
| 1096 | 1096 | DB::query( |
| 1097 | 1097 | 'SELECT * |
| 1098 | - FROM ' . prefixTable('roles_values') . ' |
|
| 1098 | + FROM ' . prefixTable('roles_values').' |
|
| 1099 | 1099 | WHERE folder_id = %i AND role_id = %i', |
| 1100 | 1100 | $newFolderId, |
| 1101 | 1101 | $record['role_id'] |
@@ -1115,7 +1115,7 @@ discard block |
||
| 1115 | 1115 | // if parent folder has Custom Fields Categories then add to this child one too |
| 1116 | 1116 | $rows = DB::query( |
| 1117 | 1117 | 'SELECT id_category |
| 1118 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 1118 | + FROM ' . prefixTable('categories_folders').' |
|
| 1119 | 1119 | WHERE id_folder = %i', |
| 1120 | 1120 | $nodeInfo->id |
| 1121 | 1121 | ); |
@@ -1134,7 +1134,7 @@ discard block |
||
| 1134 | 1134 | |
| 1135 | 1135 | $rows = DB::query( |
| 1136 | 1136 | 'SELECT * |
| 1137 | - FROM ' . prefixTable('items') . ' |
|
| 1137 | + FROM ' . prefixTable('items').' |
|
| 1138 | 1138 | WHERE id_tree = %i', |
| 1139 | 1139 | $nodeInfo->id |
| 1140 | 1140 | ); |
@@ -1143,7 +1143,7 @@ discard block |
||
| 1143 | 1143 | // if it is then don't copy it |
| 1144 | 1144 | $item_deleted = DB::queryFirstRow( |
| 1145 | 1145 | 'SELECT * |
| 1146 | - FROM ' . prefixTable('log_items') . ' |
|
| 1146 | + FROM ' . prefixTable('log_items').' |
|
| 1147 | 1147 | WHERE id_item = %i AND action = %s |
| 1148 | 1148 | ORDER BY date DESC |
| 1149 | 1149 | LIMIT 0, 1', |
@@ -1154,7 +1154,7 @@ discard block |
||
| 1154 | 1154 | |
| 1155 | 1155 | $item_restored = DB::queryFirstRow( |
| 1156 | 1156 | 'SELECT * |
| 1157 | - FROM ' . prefixTable('log_items') . ' |
|
| 1157 | + FROM ' . prefixTable('log_items').' |
|
| 1158 | 1158 | WHERE id_item = %i AND action = %s |
| 1159 | 1159 | ORDER BY date DESC |
| 1160 | 1160 | LIMIT 0, 1', |
@@ -1169,7 +1169,7 @@ discard block |
||
| 1169 | 1169 | // Get the ITEM object key for the user |
| 1170 | 1170 | $userKey = DB::queryFirstRow( |
| 1171 | 1171 | 'SELECT share_key |
| 1172 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1172 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1173 | 1173 | WHERE user_id = %i AND object_id = %i', |
| 1174 | 1174 | $_SESSION['user_id'], |
| 1175 | 1175 | $record['id'] |
@@ -1244,7 +1244,7 @@ discard block |
||
| 1244 | 1244 | // Manage Custom Fields |
| 1245 | 1245 | $categories = DB::query( |
| 1246 | 1246 | 'SELECT * |
| 1247 | - FROM ' . prefixTable('categories_items') . ' |
|
| 1247 | + FROM ' . prefixTable('categories_items').' |
|
| 1248 | 1248 | WHERE item_id = %i', |
| 1249 | 1249 | $record['id'] |
| 1250 | 1250 | ); |
@@ -1292,15 +1292,15 @@ discard block |
||
| 1292 | 1292 | $files = DB::query( |
| 1293 | 1293 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
| 1294 | 1294 | f.size AS size, f.type AS type, s.share_key AS share_key |
| 1295 | - FROM ' . prefixTable('files') . ' AS f |
|
| 1296 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 1295 | + FROM ' . prefixTable('files').' AS f |
|
| 1296 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 1297 | 1297 | WHERE s.user_id = %i AND f.id_item = %i', |
| 1298 | 1298 | $_SESSION['user_id'], |
| 1299 | 1299 | $record['id'] |
| 1300 | 1300 | ); |
| 1301 | 1301 | foreach ($files as $file) { |
| 1302 | 1302 | // Check if file still exists |
| 1303 | - if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($file['file'])) === true) { |
|
| 1303 | + if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($file['file'])) === true) { |
|
| 1304 | 1304 | // Step1 - decrypt the file |
| 1305 | 1305 | $fileContent = decryptFile( |
| 1306 | 1306 | $file['file'], |
@@ -1309,9 +1309,9 @@ discard block |
||
| 1309 | 1309 | ); |
| 1310 | 1310 | |
| 1311 | 1311 | // Step2 - create file |
| 1312 | - $newFileName = md5(time() . '_' . $file['id']) . '.' . $file['extension']; |
|
| 1312 | + $newFileName = md5(time().'_'.$file['id']).'.'.$file['extension']; |
|
| 1313 | 1313 | |
| 1314 | - $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab'); |
|
| 1314 | + $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab'); |
|
| 1315 | 1315 | if ($outstream === false) { |
| 1316 | 1316 | echo prepareExchangedData( |
| 1317 | 1317 | $SETTINGS['cpassman_dir'], |
@@ -1387,7 +1387,7 @@ discard block |
||
| 1387 | 1387 | $tree->rebuild(); |
| 1388 | 1388 | |
| 1389 | 1389 | // reload cache table |
| 1390 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 1390 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 1391 | 1391 | updateCacheTable('reload', $SETTINGS, NULL); |
| 1392 | 1392 | |
| 1393 | 1393 | // Update timestamp |
@@ -1466,7 +1466,7 @@ discard block |
||
| 1466 | 1466 | // Get path |
| 1467 | 1467 | $text = ''; |
| 1468 | 1468 | foreach ($tree->getPath($folder->id, false) as $fld) { |
| 1469 | - $text .= empty($text) === true ? ' [<i>' . $fld->title : ' > ' . $fld->title; |
|
| 1469 | + $text .= empty($text) === true ? ' [<i>'.$fld->title : ' > '.$fld->title; |
|
| 1470 | 1470 | } |
| 1471 | 1471 | |
| 1472 | 1472 | // Save array |
@@ -1476,7 +1476,7 @@ discard block |
||
| 1476 | 1476 | 'id' => (int) $folder->id, |
| 1477 | 1477 | 'label' => $folder->title, |
| 1478 | 1478 | 'level' => $folder->nlevel, |
| 1479 | - 'path' => empty($text) === true ? '' : $text . '</i>]' |
|
| 1479 | + 'path' => empty($text) === true ? '' : $text.'</i>]' |
|
| 1480 | 1480 | ) |
| 1481 | 1481 | ); |
| 1482 | 1482 | } |