@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | ) { |
| 77 | 77 | // Not allowed page |
| 78 | 78 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 79 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 79 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 80 | 80 | exit; |
| 81 | 81 | } |
| 82 | 82 | |
@@ -125,9 +125,9 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT); |
| 127 | 127 | $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 128 | - $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' '; |
|
| 128 | + $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' '; |
|
| 129 | 129 | } else { |
| 130 | - $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC'; |
|
| 130 | + $sOrder = 'ORDER BY '.$aColumns[0].' DESC'; |
|
| 131 | 131 | } |
| 132 | 132 | } |
| 133 | 133 | |
@@ -138,9 +138,9 @@ discard block |
||
| 138 | 138 | if ($searchValue !== '') { |
| 139 | 139 | $sWhere .= ' AND ('; |
| 140 | 140 | foreach ($aColumns as $column) { |
| 141 | - $sWhere .= $column . " LIKE '%" . $searchValue . "%' OR "; |
|
| 141 | + $sWhere .= $column." LIKE '%".$searchValue."%' OR "; |
|
| 142 | 142 | } |
| 143 | - $sWhere = substr_replace((string) $sWhere, '', -3) . ')'; |
|
| 143 | + $sWhere = substr_replace((string) $sWhere, '', -3).')'; |
|
| 144 | 144 | } |
| 145 | 145 | } |
| 146 | 146 | |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | * Output |
| 166 | 166 | */ |
| 167 | 167 | $sOutput = '{'; |
| 168 | - $sOutput .= '"sEcho": '. $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 168 | + $sOutput .= '"sEcho": '.$request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 169 | 169 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 170 | 170 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 171 | 171 | $sOutput .= '"aaData": '; |
@@ -204,9 +204,9 @@ discard block |
||
| 204 | 204 | |
| 205 | 205 | $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT); |
| 206 | 206 | $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 207 | - $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' '; |
|
| 207 | + $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' '; |
|
| 208 | 208 | } else { |
| 209 | - $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC'; |
|
| 209 | + $sOrder = 'ORDER BY '.$aColumns[0].' DESC'; |
|
| 210 | 210 | } |
| 211 | 211 | |
| 212 | 212 | // Filtering |
@@ -215,9 +215,9 @@ discard block |
||
| 215 | 215 | if ($sSearch !== '') { |
| 216 | 216 | $sWhere .= ' AND ('; |
| 217 | 217 | foreach ($aColumns as $i => $column) { |
| 218 | - $sWhere .= $column . " LIKE '%". filter_var($sSearch, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR "; |
|
| 218 | + $sWhere .= $column." LIKE '%".filter_var($sSearch, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR "; |
|
| 219 | 219 | } |
| 220 | - $sWhere = substr_replace($sWhere, '', -3) . ')'; |
|
| 220 | + $sWhere = substr_replace($sWhere, '', -3).')'; |
|
| 221 | 221 | } |
| 222 | 222 | |
| 223 | 223 | $iTotal = DB::queryFirstField( |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | $iFilteredTotal = DB::count(); |
| 241 | 241 | // Output |
| 242 | 242 | $sOutput = '{'; |
| 243 | - $sOutput .= '"sEcho": '. $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 243 | + $sOutput .= '"sEcho": '.$request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 244 | 244 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 245 | 245 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 246 | 246 | $sOutput .= '"aaData": '; |
@@ -279,9 +279,9 @@ discard block |
||
| 279 | 279 | |
| 280 | 280 | $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT); |
| 281 | 281 | $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 282 | - $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' '; |
|
| 282 | + $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' '; |
|
| 283 | 283 | } else { |
| 284 | - $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC'; |
|
| 284 | + $sOrder = 'ORDER BY '.$aColumns[0].' DESC'; |
|
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | // Filtering |
@@ -290,9 +290,9 @@ discard block |
||
| 290 | 290 | if ($searchValue !== '') { |
| 291 | 291 | $sWhere .= ' AND ('; |
| 292 | 292 | foreach ($aColumns as $column) { |
| 293 | - $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR "; |
|
| 293 | + $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR "; |
|
| 294 | 294 | } |
| 295 | - $sWhere = substr_replace($sWhere, '', -3) . ')'; |
|
| 295 | + $sWhere = substr_replace($sWhere, '', -3).')'; |
|
| 296 | 296 | } |
| 297 | 297 | |
| 298 | 298 | $iTotal = DB::queryFirstField( |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | $iFilteredTotal = DB::count(); |
| 316 | 316 | // Output |
| 317 | 317 | $sOutput = '{'; |
| 318 | - $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 318 | + $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 319 | 319 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 320 | 320 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 321 | 321 | $sOutput .= '"aaData": '; |
@@ -354,9 +354,9 @@ discard block |
||
| 354 | 354 | |
| 355 | 355 | $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT); |
| 356 | 356 | $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 357 | - $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' '; |
|
| 357 | + $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' '; |
|
| 358 | 358 | } else { |
| 359 | - $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC'; |
|
| 359 | + $sOrder = 'ORDER BY '.$aColumns[0].' DESC'; |
|
| 360 | 360 | } |
| 361 | 361 | |
| 362 | 362 | // Filtering |
@@ -365,9 +365,9 @@ discard block |
||
| 365 | 365 | if ($searchValue !== '') { |
| 366 | 366 | $sWhere .= ' AND ('; |
| 367 | 367 | foreach ($aColumns as $column) { |
| 368 | - $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR "; |
|
| 368 | + $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR "; |
|
| 369 | 369 | } |
| 370 | - $sWhere = substr_replace($sWhere, '', -3) . ')'; |
|
| 370 | + $sWhere = substr_replace($sWhere, '', -3).')'; |
|
| 371 | 371 | } |
| 372 | 372 | |
| 373 | 373 | $iTotal = DB::queryFirstField( |
@@ -389,7 +389,7 @@ discard block |
||
| 389 | 389 | * Output |
| 390 | 390 | */ |
| 391 | 391 | $sOutput = '{'; |
| 392 | - $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 392 | + $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 393 | 393 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 394 | 394 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 395 | 395 | $sOutput .= '"aaData": [ '; |
@@ -457,9 +457,9 @@ discard block |
||
| 457 | 457 | |
| 458 | 458 | $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT); |
| 459 | 459 | $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 460 | - $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' '; |
|
| 460 | + $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' '; |
|
| 461 | 461 | } else { |
| 462 | - $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC'; |
|
| 462 | + $sOrder = 'ORDER BY '.$aColumns[0].' DESC'; |
|
| 463 | 463 | } |
| 464 | 464 | |
| 465 | 465 | // Filtering |
@@ -469,12 +469,12 @@ discard block |
||
| 469 | 469 | if ($searchValue !== '') { |
| 470 | 470 | $sWhere .= ' WHERE ('; |
| 471 | 471 | if (isset($search['column']) && $search['column'] !== 'all') { |
| 472 | - $sWhere .= $search['column'] . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%') "; |
|
| 472 | + $sWhere .= $search['column']." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%') "; |
|
| 473 | 473 | } else { |
| 474 | 474 | foreach ($aColumns as $column) { |
| 475 | - $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR "; |
|
| 475 | + $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR "; |
|
| 476 | 476 | } |
| 477 | - $sWhere = substr($sWhere, 0, -3) . ') '; |
|
| 477 | + $sWhere = substr($sWhere, 0, -3).') '; |
|
| 478 | 478 | } |
| 479 | 479 | } |
| 480 | 480 | |
@@ -503,7 +503,7 @@ discard block |
||
| 503 | 503 | $iFilteredTotal = DB::count(); |
| 504 | 504 | // Output |
| 505 | 505 | $sOutput = '{'; |
| 506 | - $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 506 | + $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 507 | 507 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 508 | 508 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 509 | 509 | $sOutput .= '"aaData": [ '; |
@@ -552,9 +552,9 @@ discard block |
||
| 552 | 552 | |
| 553 | 553 | $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT); |
| 554 | 554 | $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 555 | - $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' '; |
|
| 555 | + $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' '; |
|
| 556 | 556 | } else { |
| 557 | - $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC'; |
|
| 557 | + $sOrder = 'ORDER BY '.$aColumns[0].' DESC'; |
|
| 558 | 558 | } |
| 559 | 559 | |
| 560 | 560 | // Filtering |
@@ -563,9 +563,9 @@ discard block |
||
| 563 | 563 | if ($searchValue !== '') { |
| 564 | 564 | $sWhere .= ' AND ('; |
| 565 | 565 | foreach ($aColumns as $column) { |
| 566 | - $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR "; |
|
| 566 | + $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR "; |
|
| 567 | 567 | } |
| 568 | - $sWhere = substr_replace($sWhere, '', -3) . ')'; |
|
| 568 | + $sWhere = substr_replace($sWhere, '', -3).')'; |
|
| 569 | 569 | } |
| 570 | 570 | |
| 571 | 571 | $iTotal = DB::queryFirstField( |
@@ -586,7 +586,7 @@ discard block |
||
| 586 | 586 | $iTotal = 0; |
| 587 | 587 | } |
| 588 | 588 | $sOutput = '{'; |
| 589 | - $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 589 | + $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 590 | 590 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 591 | 591 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 592 | 592 | $sOutput .= '"aaData": '; |
@@ -628,9 +628,9 @@ discard block |
||
| 628 | 628 | |
| 629 | 629 | $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT); |
| 630 | 630 | $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 631 | - $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' '; |
|
| 631 | + $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' '; |
|
| 632 | 632 | } else { |
| 633 | - $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC'; |
|
| 633 | + $sOrder = 'ORDER BY '.$aColumns[0].' DESC'; |
|
| 634 | 634 | } |
| 635 | 635 | |
| 636 | 636 | // Filtering |
@@ -639,9 +639,9 @@ discard block |
||
| 639 | 639 | if ($searchValue !== '') { |
| 640 | 640 | $sWhere .= ' AND ('; |
| 641 | 641 | foreach ($aColumns as $column) { |
| 642 | - $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR "; |
|
| 642 | + $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR "; |
|
| 643 | 643 | } |
| 644 | - $sWhere = substr_replace($sWhere, '', -3) . ')'; |
|
| 644 | + $sWhere = substr_replace($sWhere, '', -3).')'; |
|
| 645 | 645 | } |
| 646 | 646 | |
| 647 | 647 | $iTotal = DB::queryFirstField( |
@@ -663,7 +663,7 @@ discard block |
||
| 663 | 663 | $iFilteredTotal = DB::count(); |
| 664 | 664 | // Output |
| 665 | 665 | $sOutput = '{'; |
| 666 | - $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 666 | + $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 667 | 667 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 668 | 668 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 669 | 669 | $sOutput .= '"aaData": '; |
@@ -700,9 +700,9 @@ discard block |
||
| 700 | 700 | |
| 701 | 701 | $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT); |
| 702 | 702 | $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 703 | - $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' '; |
|
| 703 | + $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' '; |
|
| 704 | 704 | } else { |
| 705 | - $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC'; |
|
| 705 | + $sOrder = 'ORDER BY '.$aColumns[0].' DESC'; |
|
| 706 | 706 | } |
| 707 | 707 | |
| 708 | 708 | // Filtering |
@@ -711,9 +711,9 @@ discard block |
||
| 711 | 711 | if ($searchValue !== '') { |
| 712 | 712 | $sWhere = ' WHERE ('; |
| 713 | 713 | foreach ($aColumns as $column) { |
| 714 | - $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR "; |
|
| 714 | + $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR "; |
|
| 715 | 715 | } |
| 716 | - $sWhere = substr_replace($sWhere, '', -3) . ')'; |
|
| 716 | + $sWhere = substr_replace($sWhere, '', -3).')'; |
|
| 717 | 717 | } |
| 718 | 718 | |
| 719 | 719 | $iTotal = DB::queryFirstField( |
@@ -736,7 +736,7 @@ discard block |
||
| 736 | 736 | $iFilteredTotal = DB::count(); |
| 737 | 737 | // Output |
| 738 | 738 | $sOutput = '{'; |
| 739 | - $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 739 | + $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 740 | 740 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 741 | 741 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 742 | 742 | $sOutput .= '"aaData": '; |
@@ -778,9 +778,9 @@ discard block |
||
| 778 | 778 | |
| 779 | 779 | $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT); |
| 780 | 780 | $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 781 | - $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' '; |
|
| 781 | + $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' '; |
|
| 782 | 782 | } else { |
| 783 | - $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC'; |
|
| 783 | + $sOrder = 'ORDER BY '.$aColumns[0].' DESC'; |
|
| 784 | 784 | } |
| 785 | 785 | |
| 786 | 786 | // Where clause |
@@ -789,9 +789,9 @@ discard block |
||
| 789 | 789 | if ($searchValue !== '') { |
| 790 | 790 | $sWhere .= ' AND ('; |
| 791 | 791 | foreach ($aColumns as $column) { |
| 792 | - $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR "; |
|
| 792 | + $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR "; |
|
| 793 | 793 | } |
| 794 | - $sWhere = substr_replace($sWhere, '', -3) . ') '; |
|
| 794 | + $sWhere = substr_replace($sWhere, '', -3).') '; |
|
| 795 | 795 | } |
| 796 | 796 | $sWhere .= ') '; |
| 797 | 797 | $iTotal = DB::queryFirstField( |
@@ -809,7 +809,7 @@ discard block |
||
| 809 | 809 | $iFilteredTotal = DB::count(); |
| 810 | 810 | // Output |
| 811 | 811 | $sOutput = '{'; |
| 812 | - $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 812 | + $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 813 | 813 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 814 | 814 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 815 | 815 | $sOutput .= '"aaData": '; |
@@ -858,9 +858,9 @@ discard block |
||
| 858 | 858 | |
| 859 | 859 | $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT); |
| 860 | 860 | $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 861 | - $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' '; |
|
| 861 | + $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' '; |
|
| 862 | 862 | } else { |
| 863 | - $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC'; |
|
| 863 | + $sOrder = 'ORDER BY '.$aColumns[0].' DESC'; |
|
| 864 | 864 | } |
| 865 | 865 | |
| 866 | 866 | // Where clause |
@@ -869,9 +869,9 @@ discard block |
||
| 869 | 869 | if ($searchValue !== '') { |
| 870 | 870 | $sWhere .= ' AND ('; |
| 871 | 871 | foreach ($aColumns as $column) { |
| 872 | - $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR "; |
|
| 872 | + $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR "; |
|
| 873 | 873 | } |
| 874 | - $sWhere = substr_replace($sWhere, '', -3) . ')'; |
|
| 874 | + $sWhere = substr_replace($sWhere, '', -3).')'; |
|
| 875 | 875 | } |
| 876 | 876 | $sWhere .= ') '; |
| 877 | 877 | DB::debugmode(false); |
@@ -892,7 +892,7 @@ discard block |
||
| 892 | 892 | $iFilteredTotal = DB::count(); |
| 893 | 893 | // Output |
| 894 | 894 | $sOutput = '{'; |
| 895 | - $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 895 | + $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 896 | 896 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 897 | 897 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 898 | 898 | $sOutput .= '"aaData": '; |
@@ -907,7 +907,7 @@ discard block |
||
| 907 | 907 | //col1 |
| 908 | 908 | $sOutput .= '"<span data-done=\"'.$record['is_in_progress'].'\" data-type=\"'.$record['process_type'].'\" data-process-id=\"'.$record['increment_id'].'\"></span>", '; |
| 909 | 909 | //col2 |
| 910 | - $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", '; |
|
| 910 | + $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", '; |
|
| 911 | 911 | //col3 |
| 912 | 912 | //$sOutput .= '"'.($record['updated_at'] === '' ? '-' : date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['updated_at'])).'", '; |
| 913 | 913 | $sOutput .= '"<div class=\"progress mt-2\"><div class=\"progress-bar\" style=\"width: '.$subtaskProgress.'\">'.$subtaskProgress.'</div></div>", '; |
@@ -917,7 +917,7 @@ discard block |
||
| 917 | 917 | // col5 |
| 918 | 918 | if (in_array($record['process_type'], array('create_user_keys', 'item_copy')) === true) { |
| 919 | 919 | $data_user = DB::queryfirstrow( |
| 920 | - 'SELECT name, lastname FROM ' . prefixTable('users') . ' |
|
| 920 | + 'SELECT name, lastname FROM '.prefixTable('users').' |
|
| 921 | 921 | WHERE id = %i', |
| 922 | 922 | json_decode($record['arguments'], true)['new_user_id'] |
| 923 | 923 | ); |
@@ -949,9 +949,9 @@ discard block |
||
| 949 | 949 | |
| 950 | 950 | $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT); |
| 951 | 951 | $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 952 | - $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' '; |
|
| 952 | + $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' '; |
|
| 953 | 953 | } else { |
| 954 | - $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC'; |
|
| 954 | + $sOrder = 'ORDER BY '.$aColumns[0].' DESC'; |
|
| 955 | 955 | } |
| 956 | 956 | |
| 957 | 957 | // Where clause |
@@ -960,9 +960,9 @@ discard block |
||
| 960 | 960 | if ($searchValue !== '') { |
| 961 | 961 | $sWhere .= ' AND ('; |
| 962 | 962 | foreach ($aColumns as $column) { |
| 963 | - $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR "; |
|
| 963 | + $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR "; |
|
| 964 | 964 | } |
| 965 | - $sWhere = substr_replace($sWhere, '', -3) . ')'; |
|
| 965 | + $sWhere = substr_replace($sWhere, '', -3).')'; |
|
| 966 | 966 | } |
| 967 | 967 | $sWhere .= ') '; |
| 968 | 968 | |
@@ -985,7 +985,7 @@ discard block |
||
| 985 | 985 | $iFilteredTotal = DB::count(); |
| 986 | 986 | // Output |
| 987 | 987 | $sOutput = '{'; |
| 988 | - $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 988 | + $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 989 | 989 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 990 | 990 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 991 | 991 | $sOutput .= '"aaData": '; |
@@ -1001,13 +1001,12 @@ discard block |
||
| 1001 | 1001 | //col1 |
| 1002 | 1002 | $sOutput .= '"", '; |
| 1003 | 1003 | //col2 |
| 1004 | - $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", '; |
|
| 1004 | + $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", '; |
|
| 1005 | 1005 | //col3 |
| 1006 | 1006 | $sOutput .= is_null($record['started_at']) === false ? |
| 1007 | - ('"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['started_at']).'", ') : |
|
| 1008 | - ('"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", '); |
|
| 1007 | + ('"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['started_at']).'", ') : ('"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", '); |
|
| 1009 | 1008 | //col4 |
| 1010 | - $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['finished_at']).'", '; |
|
| 1009 | + $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['finished_at']).'", '; |
|
| 1011 | 1010 | // col7 |
| 1012 | 1011 | $sOutput .= '"'.gmdate('H:i:s', (int) $record['finished_at'] - (is_null($record['started_at']) === false ? (int) $record['started_at'] : (int) $record['created_at'])).'",'; |
| 1013 | 1012 | //col5 |
@@ -1026,7 +1025,7 @@ discard block |
||
| 1026 | 1025 | $newUserId = array_key_exists('new_user_id', $arguments) ? $arguments['new_user_id'] : null; |
| 1027 | 1026 | if ($record['process_type'] === 'create_user_keys' && is_null($newUserId) === false && empty($newUserId) === false) { |
| 1028 | 1027 | $data_user = DB::queryfirstrow( |
| 1029 | - 'SELECT name, lastname, login FROM ' . prefixTable('users') . ' |
|
| 1028 | + 'SELECT name, lastname, login FROM '.prefixTable('users').' |
|
| 1030 | 1029 | WHERE id = %i', |
| 1031 | 1030 | $newUserId |
| 1032 | 1031 | ); |
@@ -1042,7 +1041,7 @@ discard block |
||
| 1042 | 1041 | } elseif ($record['process_type'] === 'user_build_cache_tree') { |
| 1043 | 1042 | $user = json_decode($record['arguments'], true)['user_id']; |
| 1044 | 1043 | $data_user = DB::queryfirstrow( |
| 1045 | - 'SELECT name, lastname, login FROM ' . prefixTable('users') . ' |
|
| 1044 | + 'SELECT name, lastname, login FROM '.prefixTable('users').' |
|
| 1046 | 1045 | WHERE id = %i', |
| 1047 | 1046 | $user |
| 1048 | 1047 | ); |
@@ -1076,7 +1075,7 @@ discard block |
||
| 1076 | 1075 | { |
| 1077 | 1076 | $subtasks = DB::query( |
| 1078 | 1077 | 'SELECT * |
| 1079 | - FROM ' . prefixTable('background_subtasks') . ' |
|
| 1078 | + FROM ' . prefixTable('background_subtasks').' |
|
| 1080 | 1079 | WHERE task_id = %i', |
| 1081 | 1080 | $id |
| 1082 | 1081 | ); |
@@ -1092,5 +1091,5 @@ discard block |
||
| 1092 | 1091 | $i++; |
| 1093 | 1092 | } |
| 1094 | 1093 | |
| 1095 | - return ($finished_nb !== 0 ? pourcentage($finished_nb, $nb, 100) : 0) .'%'; |
|
| 1094 | + return ($finished_nb !== 0 ? pourcentage($finished_nb, $nb, 100) : 0).'%'; |
|
| 1096 | 1095 | } |
| 1097 | 1096 | \ No newline at end of file |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('admin') === false) { |
| 72 | 72 | // Not allowed page |
| 73 | 73 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 74 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 74 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 75 | 75 | exit; |
| 76 | 76 | } |
| 77 | 77 | |
@@ -267,7 +267,7 @@ discard block |
||
| 267 | 267 | <div class="card-body"> |
| 268 | 268 | <?php |
| 269 | 269 | // Display information about server |
| 270 | - $dbSize = DB::queryFirstRow("SELECT ROUND(SUM(data_length + index_length) / 1024 / 1024, 2) AS 'size' FROM information_schema.TABLES WHERE table_schema = '" . DB_NAME . "'"); |
|
| 270 | + $dbSize = DB::queryFirstRow("SELECT ROUND(SUM(data_length + index_length) / 1024 / 1024, 2) AS 'size' FROM information_schema.TABLES WHERE table_schema = '".DB_NAME."'"); |
|
| 271 | 271 | |
| 272 | 272 | // Get OS |
| 273 | 273 | $uname = php_uname('s'); |
@@ -323,17 +323,17 @@ discard block |
||
| 323 | 323 | } |
| 324 | 324 | |
| 325 | 325 | echo |
| 326 | - '<p>' . $os. |
|
| 326 | + '<p>'.$os. |
|
| 327 | 327 | '<br><span class="ml-4"></span>'. |
| 328 | 328 | '</p>'. |
| 329 | 329 | $internetAccess. |
| 330 | - '<p><i class="fa-brands fa-php mr-2"></i>PHP version: ' . phpversion(). |
|
| 330 | + '<p><i class="fa-brands fa-php mr-2"></i>PHP version: '.phpversion(). |
|
| 331 | 331 | '<br><span class="ml-4">Memory limit: '.(ini_get('memory_limit')).'</span>'. |
| 332 | 332 | '<br><span class="ml-4">Memory usage: '.formatSizeUnits(memory_get_usage()).'</span>'. |
| 333 | 333 | '<br><span class="ml-4">Maximum time execution: '.ini_get('max_execution_time').'</span>'. |
| 334 | 334 | '<br><span class="ml-4">Maximum file size upload: '.ini_get('upload_max_filesize').'</span>'. |
| 335 | 335 | '</p>'. |
| 336 | - '<p><i class="fa-solid fa-server mr-2"></i>Server version: ' . DB::serverVersion(). |
|
| 336 | + '<p><i class="fa-solid fa-server mr-2"></i>Server version: '.DB::serverVersion(). |
|
| 337 | 337 | '<br><span class="ml-4">Database size: '.($dbSize['size']).'MB</span>'. |
| 338 | 338 | '</p>'; |
| 339 | 339 | |
@@ -341,11 +341,11 @@ discard block |
||
| 341 | 341 | $serverTime = localtime(time(), true); |
| 342 | 342 | echo '<div class="row">'. |
| 343 | 343 | '<div class="col-6"><i class="fa-solid fa-clock mr-2"></i>Server time:</div>'. |
| 344 | - '<div class="col-6"><span class="badge badge-info">' . |
|
| 345 | - str_pad(strval($serverTime['tm_hour']), 2, "0", STR_PAD_LEFT) . ':' . |
|
| 346 | - str_pad(strval($serverTime['tm_min']), 2, "0", STR_PAD_LEFT) . ':' . |
|
| 347 | - str_pad(strval($serverTime['tm_sec']), 2, "0", STR_PAD_LEFT) . |
|
| 348 | - '</span></div>' . |
|
| 344 | + '<div class="col-6"><span class="badge badge-info">'. |
|
| 345 | + str_pad(strval($serverTime['tm_hour']), 2, "0", STR_PAD_LEFT).':'. |
|
| 346 | + str_pad(strval($serverTime['tm_min']), 2, "0", STR_PAD_LEFT).':'. |
|
| 347 | + str_pad(strval($serverTime['tm_sec']), 2, "0", STR_PAD_LEFT). |
|
| 348 | + '</span></div>'. |
|
| 349 | 349 | '</div>'. |
| 350 | 350 | '<div class="row">'. |
| 351 | 351 | '<div class="col-6"><span class="ml-4">Timezone:</span></div>'. |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | // SQL where clause with folders list |
| 56 | 56 | if (isset($arrQueryStringParams['folders']) === true) { |
| 57 | 57 | // convert the folders to an array |
| 58 | - $arrQueryStringParams['folders'] = explode(',', str_replace( array('[',']') , '' , $arrQueryStringParams['folders'])); |
|
| 58 | + $arrQueryStringParams['folders'] = explode(',', str_replace(array('[', ']'), '', $arrQueryStringParams['folders'])); |
|
| 59 | 59 | |
| 60 | 60 | // ensure to only use the intersection |
| 61 | 61 | $foldersList = implode(',', array_intersect($arrQueryStringParams['folders'], $userData['folders_list'])); |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | } else { |
| 217 | 217 | // Gérer le cas où les paramètres ne sont pas un tableau |
| 218 | 218 | $strErrorDesc = 'Data not consistent'; |
| 219 | - $strErrorHeader = 'Expected array, received ' . gettype($arrQueryStringParams); |
|
| 219 | + $strErrorHeader = 'Expected array, received '.gettype($arrQueryStringParams); |
|
| 220 | 220 | } |
| 221 | 221 | } |
| 222 | 222 | } else { |
@@ -263,10 +263,10 @@ discard block |
||
| 263 | 263 | // SQL where clause with item id |
| 264 | 264 | if (isset($arrQueryStringParams['id']) === true) { |
| 265 | 265 | // build sql where clause by ID |
| 266 | - $sqlExtra = ' WHERE i.id = '.$arrQueryStringParams['id'] . $sql_constraint; |
|
| 266 | + $sqlExtra = ' WHERE i.id = '.$arrQueryStringParams['id'].$sql_constraint; |
|
| 267 | 267 | } else if (isset($arrQueryStringParams['label']) === true) { |
| 268 | 268 | // build sql where clause by LABEL |
| 269 | - $sqlExtra = ' WHERE i.label '.(isset($arrQueryStringParams['like']) === true && (int) $arrQueryStringParams['like'] === 1 ? ' LIKE '.$arrQueryStringParams['label'] : ' = '.$arrQueryStringParams['label']) . $sql_constraint; |
|
| 269 | + $sqlExtra = ' WHERE i.label '.(isset($arrQueryStringParams['like']) === true && (int) $arrQueryStringParams['like'] === 1 ? ' LIKE '.$arrQueryStringParams['label'] : ' = '.$arrQueryStringParams['label']).$sql_constraint; |
|
| 270 | 270 | } else if (isset($arrQueryStringParams['description']) === true) { |
| 271 | 271 | // build sql where clause by LABEL |
| 272 | 272 | $sqlExtra = ' WHERE i.description '.(isset($arrQueryStringParams['like']) === true && (int) $arrQueryStringParams['like'] === 1 ? ' LIKE '.$arrQueryStringParams['description'] : ' = '.$arrQueryStringParams['description']).$sql_constraint; |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | csrfProtector::init(); |
| 74 | 74 | |
| 75 | 75 | // Load functions |
| 76 | -require_once __DIR__. '/includes/config/include.php'; |
|
| 76 | +require_once __DIR__.'/includes/config/include.php'; |
|
| 77 | 77 | require_once __DIR__.'/sources/main.functions.php'; |
| 78 | 78 | |
| 79 | 79 | // init |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | $SETTINGS = $antiXss->xss_clean($SETTINGS); |
| 108 | 108 | |
| 109 | 109 | // Load Core library |
| 110 | -require_once $SETTINGS['cpassman_dir'] . '/sources/core.php'; |
|
| 110 | +require_once $SETTINGS['cpassman_dir'].'/sources/core.php'; |
|
| 111 | 111 | // Prepare POST variables |
| 112 | 112 | $post_language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 113 | 113 | $session_user_language = $session->get('user-language'); |
@@ -146,8 +146,8 @@ discard block |
||
| 146 | 146 | //get default language |
| 147 | 147 | $dataLanguage = DB::queryFirstRow( |
| 148 | 148 | 'SELECT m.valeur AS valeur, l.flag AS flag |
| 149 | - FROM ' . prefixTable('misc') . ' AS m |
|
| 150 | - INNER JOIN ' . prefixTable('languages') . ' AS l ON (m.valeur = l.name) |
|
| 149 | + FROM ' . prefixTable('misc').' AS m |
|
| 150 | + INNER JOIN ' . prefixTable('languages').' AS l ON (m.valeur = l.name) |
|
| 151 | 151 | WHERE m.type=%s_type AND m.intitule=%s_intitule', |
| 152 | 152 | [ |
| 153 | 153 | 'type' => 'admin', |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | $session_user_language = $SETTINGS['default_language']; |
| 179 | 179 | } |
| 180 | 180 | } |
| 181 | -$lang = new Language($session_user_language, __DIR__. '/includes/language/'); |
|
| 181 | +$lang = new Language($session_user_language, __DIR__.'/includes/language/'); |
|
| 182 | 182 | |
| 183 | 183 | if (isset($SETTINGS['cpassman_dir']) === false || $SETTINGS['cpassman_dir'] === '') { |
| 184 | 184 | $SETTINGS['cpassman_dir'] = __DIR__; |
@@ -252,29 +252,29 @@ discard block |
||
| 252 | 252 | </script> |
| 253 | 253 | |
| 254 | 254 | <!-- IonIcons --> |
| 255 | - <link rel="stylesheet" href="includes/css/ionicons.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 255 | + <link rel="stylesheet" href="includes/css/ionicons.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 256 | 256 | <!-- Theme style --> |
| 257 | - <link rel="stylesheet" href="plugins/adminlte/css/adminlte.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 258 | - <link rel="stylesheet" href="plugins/pace-progress/themes/corner-indicator.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 259 | - <link rel="stylesheet" href="plugins/select2/css/select2.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 260 | - <link rel="stylesheet" href="plugins/select2/theme/select2-bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 257 | + <link rel="stylesheet" href="plugins/adminlte/css/adminlte.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 258 | + <link rel="stylesheet" href="plugins/pace-progress/themes/corner-indicator.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 259 | + <link rel="stylesheet" href="plugins/select2/css/select2.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 260 | + <link rel="stylesheet" href="plugins/select2/theme/select2-bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 261 | 261 | <!-- Theme style --> |
| 262 | - <link rel="stylesheet" href="includes/css/teampass.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 262 | + <link rel="stylesheet" href="includes/css/teampass.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 263 | 263 | <!-- Google Font: Source Sans Pro --> |
| 264 | - <link rel="stylesheet" type="text/css" href="includes/fonts/fonts.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 264 | + <link rel="stylesheet" type="text/css" href="includes/fonts/fonts.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 265 | 265 | <!-- Altertify --> |
| 266 | - <link rel="stylesheet" href="plugins/alertifyjs/css/alertify.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 267 | - <link rel="stylesheet" href="plugins/alertifyjs/css/themes/bootstrap.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 266 | + <link rel="stylesheet" href="plugins/alertifyjs/css/alertify.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 267 | + <link rel="stylesheet" href="plugins/alertifyjs/css/themes/bootstrap.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 268 | 268 | <!-- Toastr --> |
| 269 | - <link rel="stylesheet" href="plugins/toastr/toastr.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 269 | + <link rel="stylesheet" href="plugins/toastr/toastr.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 270 | 270 | <!-- favicon --> |
| 271 | - <link rel="shortcut icon" type="image/png" href="<?php echo $favicon;?>"/> |
|
| 271 | + <link rel="shortcut icon" type="image/png" href="<?php echo $favicon; ?>"/> |
|
| 272 | 272 | <!-- manifest (PWA) --> |
| 273 | - <link rel="manifest" href="manifest.json?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 273 | + <link rel="manifest" href="manifest.json?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 274 | 274 | <!-- Custom style --> |
| 275 | 275 | <?php |
| 276 | - if (file_exists(__DIR__ . '/includes/css/custom.css') === true) {?> |
|
| 277 | - <link rel="stylesheet" href="includes/css/custom.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 276 | + if (file_exists(__DIR__.'/includes/css/custom.css') === true) {?> |
|
| 277 | + <link rel="stylesheet" href="includes/css/custom.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 278 | 278 | <?php |
| 279 | 279 | } ?> |
| 280 | 280 | </head> |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | <div class="dropdown show"> |
| 323 | 323 | <a class="btn btn-primary dropdown-toggle" href="#" data-toggle="dropdown"> |
| 324 | 324 | <?php |
| 325 | - echo $session_name . ' ' . $session_lastname; ?> |
|
| 325 | + echo $session_name.' '.$session_lastname; ?> |
|
| 326 | 326 | </a> |
| 327 | 327 | |
| 328 | 328 | <div class="dropdown-menu dropdown-menu-right"> |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | </a> |
| 347 | 347 | <?php |
| 348 | 348 | } ?> |
| 349 | - <a class="dropdown-item user-menu<?php echo (int) $session_user_admin === 1 ? ' hidden' : '';?>" href="#" data-name="generate-new_keys"> |
|
| 349 | + <a class="dropdown-item user-menu<?php echo (int) $session_user_admin === 1 ? ' hidden' : ''; ?>" href="#" data-name="generate-new_keys"> |
|
| 350 | 350 | <i class="fa-solid fa-spray-can-sparkles fa-fw mr-2"></i><?php echo $lang->get('generate_new_keys'); ?> |
| 351 | 351 | </a> |
| 352 | 352 | |
@@ -380,7 +380,7 @@ discard block |
||
| 380 | 380 | <!-- Main Sidebar Container --> |
| 381 | 381 | <aside class="main-sidebar sidebar-dark-primary elevation-4"> |
| 382 | 382 | <!-- Brand Logo --> |
| 383 | - <a href="<?php echo $cpassman_url . '/index.php?page=' . ((int) $session_user_admin === 1 ? 'admin' : 'items'); ?>" class="brand-link"> |
|
| 383 | + <a href="<?php echo $cpassman_url.'/index.php?page='.((int) $session_user_admin === 1 ? 'admin' : 'items'); ?>" class="brand-link"> |
|
| 384 | 384 | <img src="includes/images/teampass-logo2-home.png" alt="Teampass Logo" class="brand-image"> |
| 385 | 385 | <span class="brand-text font-weight-light"><?php echo TP_TOOL_NAME; ?></span> |
| 386 | 386 | </a> |
@@ -398,20 +398,20 @@ discard block |
||
| 398 | 398 | <a href="#" data-name="items" class="nav-link', $get['page'] === 'items' ? ' active' : '', '"> |
| 399 | 399 | <i class="nav-icon fa-solid fa-key"></i> |
| 400 | 400 | <p> |
| 401 | - ' . $lang->get('pw') . ' |
|
| 401 | + ' . $lang->get('pw').' |
|
| 402 | 402 | </p> |
| 403 | 403 | </a> |
| 404 | 404 | </li>'; |
| 405 | 405 | } |
| 406 | 406 | |
| 407 | 407 | // IMPORT menu |
| 408 | - if (isset($SETTINGS['allow_import']) === true && (int) $SETTINGS['allow_import'] === 1&& $session_user_admin === 0) { |
|
| 408 | + if (isset($SETTINGS['allow_import']) === true && (int) $SETTINGS['allow_import'] === 1 && $session_user_admin === 0) { |
|
| 409 | 409 | echo ' |
| 410 | 410 | <li class="nav-item"> |
| 411 | 411 | <a href="#" data-name="import" class="nav-link', $get['page'] === 'import' ? ' active' : '', '"> |
| 412 | 412 | <i class="nav-icon fa-solid fa-file-import"></i> |
| 413 | 413 | <p> |
| 414 | - ' . $lang->get('import') . ' |
|
| 414 | + ' . $lang->get('import').' |
|
| 415 | 415 | </p> |
| 416 | 416 | </a> |
| 417 | 417 | </li>'; |
@@ -432,7 +432,7 @@ discard block |
||
| 432 | 432 | <a href="#" data-name="export" class="nav-link', $get['page'] === 'export' ? ' active' : '', '"> |
| 433 | 433 | <i class="nav-icon fa-solid fa-file-export"></i> |
| 434 | 434 | <p> |
| 435 | - ' . $lang->get('export') . ' |
|
| 435 | + ' . $lang->get('export').' |
|
| 436 | 436 | </p> |
| 437 | 437 | </a> |
| 438 | 438 | </li>'; |
@@ -459,7 +459,7 @@ discard block |
||
| 459 | 459 | <a href="#" data-name="search" class="nav-link', $get['page'] === 'search' ? ' active' : '', '"> |
| 460 | 460 | <i class="nav-icon fa-solid fa-search"></i> |
| 461 | 461 | <p> |
| 462 | - ' . $lang->get('find') . ' |
|
| 462 | + ' . $lang->get('find').' |
|
| 463 | 463 | </p> |
| 464 | 464 | </a> |
| 465 | 465 | </li>'; |
@@ -475,7 +475,7 @@ discard block |
||
| 475 | 475 | <a href="#" data-name="favourites" class="nav-link', $get['page'] === 'favourites' ? ' active' : '', '"> |
| 476 | 476 | <i class="nav-icon fa-solid fa-star"></i> |
| 477 | 477 | <p> |
| 478 | - ' . $lang->get('favorites') . ' |
|
| 478 | + ' . $lang->get('favorites').' |
|
| 479 | 479 | </p> |
| 480 | 480 | </a> |
| 481 | 481 | </li>'; |
@@ -505,7 +505,7 @@ discard block |
||
| 505 | 505 | <a href="#" data-name="suggestion" class="nav-link', $get['page'] === 'suggestion' ? ' active' : '', '"> |
| 506 | 506 | <i class="nav-icon fa-solid fa-lightbulb"></i> |
| 507 | 507 | <p> |
| 508 | - ' . $lang->get('suggestion_menu') . ' |
|
| 508 | + ' . $lang->get('suggestion_menu').' |
|
| 509 | 509 | </p> |
| 510 | 510 | </a> |
| 511 | 511 | </li>'; |
@@ -518,7 +518,7 @@ discard block |
||
| 518 | 518 | <a href="#" data-name="admin" class="nav-link', $get['page'] === 'admin' ? ' active' : '', '"> |
| 519 | 519 | <i class="nav-icon fa-solid fa-info"></i> |
| 520 | 520 | <p> |
| 521 | - ' . $lang->get('admin_main') . ' |
|
| 521 | + ' . $lang->get('admin_main').' |
|
| 522 | 522 | </p> |
| 523 | 523 | </a> |
| 524 | 524 | </li> |
@@ -526,7 +526,7 @@ discard block |
||
| 526 | 526 | <a href="#" class="nav-link"> |
| 527 | 527 | <i class="nav-icon fa-solid fa-wrench"></i> |
| 528 | 528 | <p> |
| 529 | - ' . $lang->get('admin_settings') . ' |
|
| 529 | + ' . $lang->get('admin_settings').' |
|
| 530 | 530 | <i class="fa-solid fa-angle-left right"></i> |
| 531 | 531 | </p> |
| 532 | 532 | </a> |
@@ -534,63 +534,63 @@ discard block |
||
| 534 | 534 | <li class="nav-item"> |
| 535 | 535 | <a href="#" data-name="options" class="nav-link', $get['page'] === 'options' ? ' active' : '', '"> |
| 536 | 536 | <i class="fa-solid fa-check-double nav-icon"></i> |
| 537 | - <p>' . $lang->get('options') . '</p> |
|
| 537 | + <p>' . $lang->get('options').'</p> |
|
| 538 | 538 | </a> |
| 539 | 539 | </li> |
| 540 | 540 | <li class="nav-item"> |
| 541 | 541 | <a href="#" data-name="2fa" class="nav-link', $get['page'] === '2fa' ? ' active' : '', '"> |
| 542 | 542 | <i class="fa-solid fa-qrcode nav-icon"></i> |
| 543 | - <p>' . $lang->get('mfa_short') . '</p> |
|
| 543 | + <p>' . $lang->get('mfa_short').'</p> |
|
| 544 | 544 | </a> |
| 545 | 545 | </li> |
| 546 | 546 | <li class="nav-item"> |
| 547 | 547 | <a href="#" data-name="api" class="nav-link', $get['page'] === 'api' ? ' active' : '', '"> |
| 548 | 548 | <i class="fa-solid fa-cubes nav-icon"></i> |
| 549 | - <p>' . $lang->get('api') . '</p> |
|
| 549 | + <p>' . $lang->get('api').'</p> |
|
| 550 | 550 | </a> |
| 551 | 551 | </li> |
| 552 | 552 | <li class="nav-item"> |
| 553 | 553 | <a href="#" data-name="backups" class="nav-link', $get['page'] === 'backups' ? ' active' : '', '"> |
| 554 | 554 | <i class="fa-solid fa-database nav-icon"></i> |
| 555 | - <p>' . $lang->get('backups') . '</p> |
|
| 555 | + <p>' . $lang->get('backups').'</p> |
|
| 556 | 556 | </a> |
| 557 | 557 | </li> |
| 558 | 558 | <li class="nav-item"> |
| 559 | 559 | <a href="#" data-name="emails" class="nav-link', $get['page'] === 'emails' ? ' active' : '', '"> |
| 560 | 560 | <i class="fa-solid fa-envelope nav-icon"></i> |
| 561 | - <p>' . $lang->get('emails') . '</p> |
|
| 561 | + <p>' . $lang->get('emails').'</p> |
|
| 562 | 562 | </a> |
| 563 | 563 | </li> |
| 564 | 564 | <li class="nav-item"> |
| 565 | 565 | <a href="#" data-name="fields" class="nav-link', $get['page'] === 'fields' ? ' active' : '', '"> |
| 566 | 566 | <i class="fa-solid fa-keyboard nav-icon"></i> |
| 567 | - <p>' . $lang->get('fields') . '</p> |
|
| 567 | + <p>' . $lang->get('fields').'</p> |
|
| 568 | 568 | </a> |
| 569 | 569 | </li> |
| 570 | 570 | <li class="nav-item"> |
| 571 | 571 | <a href="#" data-name="ldap" class="nav-link', $get['page'] === 'ldap' ? ' active' : '', '"> |
| 572 | 572 | <i class="fa-solid fa-id-card nav-icon"></i> |
| 573 | - <p>' . $lang->get('ldap') . '</p> |
|
| 573 | + <p>' . $lang->get('ldap').'</p> |
|
| 574 | 574 | </a> |
| 575 | 575 | </li> |
| 576 | 576 | |
| 577 | 577 | <li class="nav-item"> |
| 578 | 578 | <a href="#" data-name="oauth" class="nav-link', $get['page'] === 'oauth' ? ' active' : '', '"> |
| 579 | 579 | <i class="fa-solid fa-plug nav-icon"></i> |
| 580 | - <p>' . $lang->get('oauth') . '</p> |
|
| 580 | + <p>' . $lang->get('oauth').'</p> |
|
| 581 | 581 | </a> |
| 582 | 582 | </li> |
| 583 | 583 | |
| 584 | 584 | <li class="nav-item"> |
| 585 | 585 | <a href="#" data-name="uploads" class="nav-link', $get['page'] === 'uploads' ? ' active' : '', '"> |
| 586 | 586 | <i class="fa-solid fa-file-upload nav-icon"></i> |
| 587 | - <p>' . $lang->get('uploads') . '</p> |
|
| 587 | + <p>' . $lang->get('uploads').'</p> |
|
| 588 | 588 | </a> |
| 589 | 589 | </li> |
| 590 | 590 | <li class="nav-item"> |
| 591 | 591 | <a href="#" data-name="statistics" class="nav-link', $get['page'] === 'statistics' ? ' active' : '', '"> |
| 592 | 592 | <i class="fa-solid fa-chart-bar nav-icon"></i> |
| 593 | - <p>' . $lang->get('statistics') . '</p> |
|
| 593 | + <p>' . $lang->get('statistics').'</p> |
|
| 594 | 594 | </a> |
| 595 | 595 | </li> |
| 596 | 596 | </ul> |
@@ -601,7 +601,7 @@ discard block |
||
| 601 | 601 | <li class="nav-item"> |
| 602 | 602 | <a href="#" data-name="tasks" class="nav-link', $get['page'] === 'tasks' ? ' active' : '', '"> |
| 603 | 603 | <i class="fa-solid fa-tasks nav-icon"></i> |
| 604 | - <p>' . $lang->get('tasks') . '</p> |
|
| 604 | + <p>' . $lang->get('tasks').'</p> |
|
| 605 | 605 | </a> |
| 606 | 606 | </li>'; |
| 607 | 607 | } |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | <a href="#" data-name="tools" class="nav-link', $get['page'] === 'tools' ? ' active' : '', '"> |
| 613 | 613 | <i class="nav-icon fa-solid fa-screwdriver-wrench"></i> |
| 614 | 614 | <p> |
| 615 | - ' . $lang->get('tools') . ' |
|
| 615 | + ' . $lang->get('tools').' |
|
| 616 | 616 | </p> |
| 617 | 617 | </a> |
| 618 | 618 | </li>'; |
@@ -629,7 +629,7 @@ discard block |
||
| 629 | 629 | <a href="#" data-name="folders" class="nav-link', $get['page'] === 'folders' ? ' active' : '', '"> |
| 630 | 630 | <i class="nav-icon fa-solid fa-folder-open"></i> |
| 631 | 631 | <p> |
| 632 | - ' . $lang->get('folders') . ' |
|
| 632 | + ' . $lang->get('folders').' |
|
| 633 | 633 | </p> |
| 634 | 634 | </a> |
| 635 | 635 | </li> |
@@ -637,7 +637,7 @@ discard block |
||
| 637 | 637 | <a href="#" data-name="roles" class="nav-link', $get['page'] === 'roles' ? ' active' : '', '"> |
| 638 | 638 | <i class="nav-icon fa-solid fa-graduation-cap"></i> |
| 639 | 639 | <p> |
| 640 | - ' . $lang->get('roles') . ' |
|
| 640 | + ' . $lang->get('roles').' |
|
| 641 | 641 | </p> |
| 642 | 642 | </a> |
| 643 | 643 | </li> |
@@ -645,38 +645,38 @@ discard block |
||
| 645 | 645 | <a href="#" data-name="users" class="nav-link', $get['page'] === 'users' ? ' active' : '', '"> |
| 646 | 646 | <i class="nav-icon fa-solid fa-users"></i> |
| 647 | 647 | <p> |
| 648 | - ' . $lang->get('users') . ' |
|
| 648 | + ' . $lang->get('users').' |
|
| 649 | 649 | </p> |
| 650 | 650 | </a> |
| 651 | 651 | </li> |
| 652 | 652 | <li class="nav-item has-treeview', $menuUtilities === true ? ' menu-open' : '', '"> |
| 653 | 653 | <a href="#" class="nav-link"> |
| 654 | 654 | <i class="nav-icon fa-solid fa-cubes"></i> |
| 655 | - <p>' . $lang->get('admin_views') . '<i class="fa-solid fa-angle-left right"></i></p> |
|
| 655 | + <p>' . $lang->get('admin_views').'<i class="fa-solid fa-angle-left right"></i></p> |
|
| 656 | 656 | </a> |
| 657 | 657 | <ul class="nav nav-treeview"> |
| 658 | 658 | <li class="nav-item"> |
| 659 | 659 | <a href="#" data-name="utilities.renewal" class="nav-link', $get['page'] === 'utilities.renewal' ? ' active' : '', '"> |
| 660 | 660 | <i class="far fa-calendar-alt nav-icon"></i> |
| 661 | - <p>' . $lang->get('renewal') . '</p> |
|
| 661 | + <p>' . $lang->get('renewal').'</p> |
|
| 662 | 662 | </a> |
| 663 | 663 | </li> |
| 664 | 664 | <li class="nav-item"> |
| 665 | 665 | <a href="#" data-name="utilities.deletion" class="nav-link', $get['page'] === 'utilities.deletion' ? ' active' : '', '"> |
| 666 | 666 | <i class="fa-solid fa-trash-alt nav-icon"></i> |
| 667 | - <p>' . $lang->get('deletion') . '</p> |
|
| 667 | + <p>' . $lang->get('deletion').'</p> |
|
| 668 | 668 | </a> |
| 669 | 669 | </li> |
| 670 | 670 | <li class="nav-item"> |
| 671 | 671 | <a href="#" data-name="utilities.logs" class="nav-link', $get['page'] === 'utilities.logs' ? ' active' : '', '"> |
| 672 | 672 | <i class="fa-solid fa-history nav-icon"></i> |
| 673 | - <p>' . $lang->get('logs') . '</p> |
|
| 673 | + <p>' . $lang->get('logs').'</p> |
|
| 674 | 674 | </a> |
| 675 | 675 | </li> |
| 676 | 676 | <li class="nav-item"> |
| 677 | 677 | <a href="#" data-name="utilities.database" class="nav-link', $get['page'] === 'utilities.database' ? ' active' : '', '"> |
| 678 | 678 | <i class="fa-solid fa-database nav-icon"></i> |
| 679 | - <p>' . $lang->get('database') . '</p> |
|
| 679 | + <p>' . $lang->get('database').'</p> |
|
| 680 | 680 | </a> |
| 681 | 681 | </li> |
| 682 | 682 | </ul> |
@@ -687,10 +687,10 @@ discard block |
||
| 687 | 687 | <!-- /.sidebar-menu --> |
| 688 | 688 | <div class="menu-footer"> |
| 689 | 689 | <div class="" id="sidebar-footer"> |
| 690 | - <i class="fa-solid fa-clock-o mr-2 infotip text-info pointer" title="<?php echo htmlspecialchars($lang->get('server_time') . ' ' . |
|
| 691 | - date($date_format, (int) $server['request_time']) . ' - ' . |
|
| 690 | + <i class="fa-solid fa-clock-o mr-2 infotip text-info pointer" title="<?php echo htmlspecialchars($lang->get('server_time').' '. |
|
| 691 | + date($date_format, (int) $server['request_time']).' - '. |
|
| 692 | 692 | date($time_format, (int) $server['request_time']), ENT_QUOTES, 'UTF-8'); ?>"></i> |
| 693 | - <i class="fa-solid fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online . ' ' . $lang->get('users_online'); ?>"></i> |
|
| 693 | + <i class="fa-solid fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online.' '.$lang->get('users_online'); ?>"></i> |
|
| 694 | 694 | <a href="<?php echo DOCUMENTATION_URL; ?>" target="_blank" class="text-info"><i class="fa-solid fa-book mr-2 infotip" title="<?php echo $lang->get('documentation_canal'); ?>"></i></a> |
| 695 | 695 | <a href="<?php echo HELP_URL; ?>" target="_blank" class="text-info"><i class="fa-solid fa-life-ring mr-2 infotip" title="<?php echo $lang->get('admin_help'); ?>"></i></a> |
| 696 | 696 | <?php if ($session_user_admin === 1) : ?><i class="fa-solid fa-bug infotip pointer text-info" title="<?php echo $lang->get('bugs_page'); ?>" onclick="generateBugReport()"></i><?php endif; ?> |
@@ -839,7 +839,7 @@ discard block |
||
| 839 | 839 | </div> |
| 840 | 840 | <div class="mt-3"> |
| 841 | 841 | <label> |
| 842 | - <span class="mr-2 pointer fw-normal"><i class="fa-solid fa-eye mr-2 text-orange"></i><?php echo $lang->get('show_user_password');?></span> |
|
| 842 | + <span class="mr-2 pointer fw-normal"><i class="fa-solid fa-eye mr-2 text-orange"></i><?php echo $lang->get('show_user_password'); ?></span> |
|
| 843 | 843 | <input type="checkbox" id="dialog-admin-change-user-password-do-show-password" class="pointer"> |
| 844 | 844 | </label> |
| 845 | 845 | </div> |
@@ -998,34 +998,34 @@ discard block |
||
| 998 | 998 | if ($get['page'] === 'items') { |
| 999 | 999 | // SHow page with Items |
| 1000 | 1000 | if ((int) $session_user_admin !== 1) { |
| 1001 | - include $SETTINGS['cpassman_dir'] . '/pages/items.php'; |
|
| 1001 | + include $SETTINGS['cpassman_dir'].'/pages/items.php'; |
|
| 1002 | 1002 | } elseif ((int) $session_user_admin === 1) { |
| 1003 | - include $SETTINGS['cpassman_dir'] . '/pages/admin.php'; |
|
| 1003 | + include $SETTINGS['cpassman_dir'].'/pages/admin.php'; |
|
| 1004 | 1004 | } else { |
| 1005 | 1005 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 1006 | 1006 | //not allowed page |
| 1007 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 1007 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 1008 | 1008 | } |
| 1009 | 1009 | } elseif (in_array($get['page'], array_keys($mngPages)) === true) { |
| 1010 | 1010 | // Define if user is allowed to see management pages |
| 1011 | 1011 | if ($session_user_admin === 1) { |
| 1012 | 1012 | // deepcode ignore FileInclusion: $get['page'] is secured through usage of array_keys test bellow |
| 1013 | - include $SETTINGS['cpassman_dir'] . '/pages/' . basename($mngPages[$get['page']]); |
|
| 1013 | + include $SETTINGS['cpassman_dir'].'/pages/'.basename($mngPages[$get['page']]); |
|
| 1014 | 1014 | } elseif ($session_user_manager === 1 || $session_user_human_resources === 1) { |
| 1015 | 1015 | if ($get['page'] === 'manage_main' || $get['page'] === 'manage_settings' |
| 1016 | 1016 | ) { |
| 1017 | 1017 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 1018 | 1018 | //not allowed page |
| 1019 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 1019 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 1020 | 1020 | } |
| 1021 | 1021 | } else { |
| 1022 | 1022 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 1023 | 1023 | //not allowed page |
| 1024 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 1024 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 1025 | 1025 | } |
| 1026 | - } elseif (empty($get['page']) === false && file_exists($SETTINGS['cpassman_dir'] . '/pages/' . $get['page'] . '.php') === true) { |
|
| 1026 | + } elseif (empty($get['page']) === false && file_exists($SETTINGS['cpassman_dir'].'/pages/'.$get['page'].'.php') === true) { |
|
| 1027 | 1027 | // deepcode ignore FileInclusion: $get['page'] is tested against file_exists just below |
| 1028 | - include $SETTINGS['cpassman_dir'] . '/pages/' . basename($get['page'] . '.php'); |
|
| 1028 | + include $SETTINGS['cpassman_dir'].'/pages/'.basename($get['page'].'.php'); |
|
| 1029 | 1029 | } else { |
| 1030 | 1030 | $session->set('system-array_roles', ERR_NOT_EXIST); |
| 1031 | 1031 | //page doesn't exist |
@@ -1061,7 +1061,7 @@ discard block |
||
| 1061 | 1061 | <footer class="main-footer"> |
| 1062 | 1062 | <!-- To the right --> |
| 1063 | 1063 | <div class="float-right d-none d-sm-inline"> |
| 1064 | - <?php echo $lang->get('version_alone'); ?> <?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?> |
|
| 1064 | + <?php echo $lang->get('version_alone'); ?> <?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?> |
|
| 1065 | 1065 | </div> |
| 1066 | 1066 | <!-- Default to the left --> |
| 1067 | 1067 | <strong>Copyright © <?php echo TP_COPYRIGHT; ?> <a href="<?php echo TEAMPASS_URL; ?>"><?php echo TP_TOOL_NAME; ?></a>.</strong> All rights reserved. |
@@ -1075,7 +1075,7 @@ discard block |
||
| 1075 | 1075 | echo ' |
| 1076 | 1076 | <input type="hidden" id="temps_restant" value="', $session->get('user-session_duration') ?? '', '" />'; |
| 1077 | 1077 | // display an item in the context of OTV link |
| 1078 | -} elseif ((null === $session->get('user-validite_pw')|| empty($session->get('user-validite_pw')) === true || empty($session->get('user-id')) === true) |
|
| 1078 | +} elseif ((null === $session->get('user-validite_pw') || empty($session->get('user-validite_pw')) === true || empty($session->get('user-id')) === true) |
|
| 1079 | 1079 | && empty($get['otv']) === false |
| 1080 | 1080 | ) { |
| 1081 | 1081 | // case where one-shot viewer |
@@ -1094,7 +1094,7 @@ discard block |
||
| 1094 | 1094 | FILTER_SANITIZE_URL |
| 1095 | 1095 | ) |
| 1096 | 1096 | ); |
| 1097 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 1097 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 1098 | 1098 | } |
| 1099 | 1099 | } elseif (//(empty($session->get('user-id')) === false && $session->get('user-id') !== null) || |
| 1100 | 1100 | empty($session->get('user-id')) === true |
@@ -1126,7 +1126,7 @@ discard block |
||
| 1126 | 1126 | } |
| 1127 | 1127 | |
| 1128 | 1128 | // LOGIN form |
| 1129 | - include $SETTINGS['cpassman_dir'] . '/includes/core/login.php'; |
|
| 1129 | + include $SETTINGS['cpassman_dir'].'/includes/core/login.php'; |
|
| 1130 | 1130 | |
| 1131 | 1131 | } else { |
| 1132 | 1132 | // Clear session |
@@ -1159,155 +1159,155 @@ discard block |
||
| 1159 | 1159 | <!-- REQUIRED SCRIPTS --> |
| 1160 | 1160 | |
| 1161 | 1161 | <!-- Font Awesome Icons --> |
| 1162 | - <link href="plugins/fontawesome-free-6/css/fontawesome.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1163 | - <link href="plugins/fontawesome-free-6/css/solid.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1164 | - <link href="plugins/fontawesome-free-6/css/regular.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1165 | - <link href="plugins/fontawesome-free-6/css/brands.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1166 | - <link href="plugins/fontawesome-free-6/css/v5-font-face.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet" /> |
|
| 1162 | + <link href="plugins/fontawesome-free-6/css/fontawesome.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1163 | + <link href="plugins/fontawesome-free-6/css/solid.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1164 | + <link href="plugins/fontawesome-free-6/css/regular.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1165 | + <link href="plugins/fontawesome-free-6/css/brands.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1166 | + <link href="plugins/fontawesome-free-6/css/v5-font-face.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet" /> |
|
| 1167 | 1167 | <!-- jQuery --> |
| 1168 | - <script src="plugins/jquery/jquery.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1169 | - <script src="plugins/jquery/jquery.cookie.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1168 | + <script src="plugins/jquery/jquery.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1169 | + <script src="plugins/jquery/jquery.cookie.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1170 | 1170 | <!-- jQuery UI --> |
| 1171 | - <script src="plugins/jqueryUI/jquery-ui.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1172 | - <link rel="stylesheet" href="plugins/jqueryUI/jquery-ui.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1171 | + <script src="plugins/jqueryUI/jquery-ui.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1172 | + <link rel="stylesheet" href="plugins/jqueryUI/jquery-ui.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1173 | 1173 | <!-- Popper --> |
| 1174 | - <script src="plugins/popper/umd/popper.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1174 | + <script src="plugins/popper/umd/popper.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1175 | 1175 | <!-- Bootstrap --> |
| 1176 | - <script src="plugins/bootstrap/js/bootstrap.bundle.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1176 | + <script src="plugins/bootstrap/js/bootstrap.bundle.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1177 | 1177 | <!-- AdminLTE --> |
| 1178 | - <script src="plugins/adminlte/js/adminlte.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1178 | + <script src="plugins/adminlte/js/adminlte.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1179 | 1179 | <!-- Altertify --> |
| 1180 | 1180 | <!--<script type="text/javascript" src="plugins/alertifyjs/alertify.min.js"></script>--> |
| 1181 | 1181 | <!-- Toastr --> |
| 1182 | - <script type="text/javascript" src="plugins/toastr/toastr.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1182 | + <script type="text/javascript" src="plugins/toastr/toastr.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1183 | 1183 | <!-- STORE.JS --> |
| 1184 | - <script type="text/javascript" src="plugins/store.js/dist/store.everything.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1184 | + <script type="text/javascript" src="plugins/store.js/dist/store.everything.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1185 | 1185 | <!-- cryptojs-aesphp --> |
| 1186 | - <script type="text/javascript" src="includes/libraries/cryptojs/crypto-js.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1187 | - <script type="text/javascript" src="includes/libraries/cryptojs/encryption.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1186 | + <script type="text/javascript" src="includes/libraries/cryptojs/crypto-js.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1187 | + <script type="text/javascript" src="includes/libraries/cryptojs/encryption.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1188 | 1188 | <!-- pace --> |
| 1189 | - <script type="text/javascript" data-pace-options='{ "ajax": true, "eventLag": false }' src="plugins/pace-progress/pace.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1189 | + <script type="text/javascript" data-pace-options='{ "ajax": true, "eventLag": false }' src="plugins/pace-progress/pace.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1190 | 1190 | <!-- clipboardjs --> |
| 1191 | - <script type="text/javascript" src="plugins/clipboard/clipboard.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1191 | + <script type="text/javascript" src="plugins/clipboard/clipboard.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1192 | 1192 | <!-- select2 --> |
| 1193 | - <script type="text/javascript" src="plugins/select2/js/select2.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1193 | + <script type="text/javascript" src="plugins/select2/js/select2.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1194 | 1194 | <!-- simplePassMeter --> |
| 1195 | - <link rel="stylesheet" href="plugins/simplePassMeter/simplePassMeter.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 1196 | - <script type="text/javascript" src="plugins/simplePassMeter/simplePassMeter.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1195 | + <link rel="stylesheet" href="plugins/simplePassMeter/simplePassMeter.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 1196 | + <script type="text/javascript" src="plugins/simplePassMeter/simplePassMeter.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1197 | 1197 | <!-- platform --> |
| 1198 | - <script type="text/javascript" src="plugins/platform/platform.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1198 | + <script type="text/javascript" src="plugins/platform/platform.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1199 | 1199 | <!-- radiobuttons --> |
| 1200 | - <link rel="stylesheet" href="plugins/radioforbuttons/bootstrap-buttons.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 1201 | - <script type="text/javascript" src="plugins/radioforbuttons/jquery.radiosforbuttons.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1200 | + <link rel="stylesheet" href="plugins/radioforbuttons/bootstrap-buttons.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 1201 | + <script type="text/javascript" src="plugins/radioforbuttons/jquery.radiosforbuttons.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1202 | 1202 | <!-- ICHECK --> |
| 1203 | 1203 | <!--<link rel="stylesheet" href="./plugins/icheck-material/icheck-material.min.css">--> |
| 1204 | - <link rel="stylesheet" href="./plugins/icheck/skins/all.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1205 | - <script type="text/javascript" src="./plugins/icheck/icheck.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1204 | + <link rel="stylesheet" href="./plugins/icheck/skins/all.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1205 | + <script type="text/javascript" src="./plugins/icheck/icheck.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1206 | 1206 | <!-- bootstrap-add-clear --> |
| 1207 | - <script type="text/javascript" src="plugins/bootstrap-add-clear/bootstrap-add-clear.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1207 | + <script type="text/javascript" src="plugins/bootstrap-add-clear/bootstrap-add-clear.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1208 | 1208 | <!-- DOMPurify --> |
| 1209 | - <script type="text/javascript" src="plugins/DOMPurify/purify.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1209 | + <script type="text/javascript" src="plugins/DOMPurify/purify.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1210 | 1210 | |
| 1211 | 1211 | <?php |
| 1212 | 1212 | $get['page'] = $request->query->filter('page', null, FILTER_SANITIZE_SPECIAL_CHARS); |
| 1213 | 1213 | if ($menuAdmin === true) { |
| 1214 | 1214 | ?> |
| 1215 | - <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 1216 | - <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 1217 | - <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1215 | + <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 1216 | + <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 1217 | + <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1218 | 1218 | <!-- InputMask --> |
| 1219 | - <script src="./plugins/inputmask/jquery.inputmask.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1219 | + <script src="./plugins/inputmask/jquery.inputmask.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1220 | 1220 | <!-- Sortable --> |
| 1221 | 1221 | <!--<script src="./plugins/sortable/jquery.sortable.js"></script>--> |
| 1222 | 1222 | <!-- PLUPLOAD --> |
| 1223 | - <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1223 | + <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1224 | 1224 | <!-- DataTables --> |
| 1225 | - <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1226 | - <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1227 | - <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1228 | - <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1229 | - <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1230 | - <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1231 | - <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1232 | - <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1233 | - <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1234 | - <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1225 | + <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1226 | + <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1227 | + <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1228 | + <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1229 | + <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1230 | + <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1231 | + <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1232 | + <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1233 | + <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1234 | + <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1235 | 1235 | <?php |
| 1236 | 1236 | } elseif (isset($get['page']) === true) { |
| 1237 | 1237 | if (in_array($get['page'], ['items', 'import']) === true) { |
| 1238 | 1238 | ?> |
| 1239 | - <link rel="stylesheet" href="./plugins/jstree/themes/default/style.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 1240 | - <link rel="stylesheet" href="./plugins/jstree/themes/default-dark/style.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 1241 | - <script src="./plugins/jstree/jstree.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1239 | + <link rel="stylesheet" href="./plugins/jstree/themes/default/style.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 1240 | + <link rel="stylesheet" href="./plugins/jstree/themes/default-dark/style.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 1241 | + <script src="./plugins/jstree/jstree.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1242 | 1242 | <!-- countdownTimer --> |
| 1243 | - <script src="./plugins/jquery.countdown360/jquery.countdown360.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1243 | + <script src="./plugins/jquery.countdown360/jquery.countdown360.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1244 | 1244 | <!-- SUMMERNOTE --> |
| 1245 | - <link rel="stylesheet" href="./plugins/summernote/summernote-bs4.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1246 | - <script src="./plugins/summernote/summernote-bs4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1245 | + <link rel="stylesheet" href="./plugins/summernote/summernote-bs4.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1246 | + <script src="./plugins/summernote/summernote-bs4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1247 | 1247 | <!-- date-picker --> |
| 1248 | - <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1249 | - <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1248 | + <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1249 | + <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1250 | 1250 | <!-- time-picker --> |
| 1251 | - <link rel="stylesheet" href="./plugins/timepicker/bootstrap-timepicker.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1252 | - <script src="./plugins/timepicker/bootstrap-timepicker.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1251 | + <link rel="stylesheet" href="./plugins/timepicker/bootstrap-timepicker.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1252 | + <script src="./plugins/timepicker/bootstrap-timepicker.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1253 | 1253 | <!-- PLUPLOAD --> |
| 1254 | - <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1254 | + <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1255 | 1255 | <!-- VALIDATE --> |
| 1256 | - <script type="text/javascript" src="plugins/jquery-validation/jquery.validate.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1256 | + <script type="text/javascript" src="plugins/jquery-validation/jquery.validate.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1257 | 1257 | <!-- PWSTRENGHT --> |
| 1258 | - <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1259 | - <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1258 | + <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1259 | + <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1260 | 1260 | <!-- TOGGLE --> |
| 1261 | - <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 1262 | - <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 1263 | - <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1261 | + <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 1262 | + <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 1263 | + <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1264 | 1264 | <?php |
| 1265 | 1265 | } elseif (in_array($get['page'], ['search', 'folders', 'users', 'roles', 'utilities.deletion', 'utilities.logs', 'utilities.database', 'utilities.renewal', 'tasks']) === true) { |
| 1266 | 1266 | ?> |
| 1267 | 1267 | <!-- DataTables --> |
| 1268 | - <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1269 | - <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1270 | - <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1271 | - <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1272 | - <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1273 | - <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1274 | - <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1275 | - <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1276 | - <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1277 | - <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1268 | + <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1269 | + <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1270 | + <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1271 | + <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1272 | + <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1273 | + <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1274 | + <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1275 | + <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1276 | + <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1277 | + <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1278 | 1278 | <!-- dater picker --> |
| 1279 | - <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1280 | - <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1279 | + <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1280 | + <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1281 | 1281 | <!-- daterange picker --> |
| 1282 | - <link rel="stylesheet" href="./plugins/daterangepicker/daterangepicker.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1283 | - <script src="./plugins/moment/moment.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1284 | - <script src="./plugins/daterangepicker/daterangepicker.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1282 | + <link rel="stylesheet" href="./plugins/daterangepicker/daterangepicker.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1283 | + <script src="./plugins/moment/moment.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1284 | + <script src="./plugins/daterangepicker/daterangepicker.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1285 | 1285 | <!-- SlimScroll --> |
| 1286 | - <script src="./plugins/slimScroll/jquery.slimscroll.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1286 | + <script src="./plugins/slimScroll/jquery.slimscroll.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1287 | 1287 | <!-- FastClick --> |
| 1288 | - <script src="./plugins/fastclick/fastclick.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1288 | + <script src="./plugins/fastclick/fastclick.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1289 | 1289 | <?php |
| 1290 | 1290 | } elseif ($get['page'] === 'profile') { |
| 1291 | 1291 | ?> |
| 1292 | 1292 | <!-- FILESAVER --> |
| 1293 | - <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1293 | + <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1294 | 1294 | <!-- PLUPLOAD --> |
| 1295 | - <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1295 | + <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1296 | 1296 | <?php |
| 1297 | 1297 | } elseif ($get['page'] === 'export') { |
| 1298 | 1298 | ?> |
| 1299 | 1299 | <!-- FILESAVER --> |
| 1300 | - <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1300 | + <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1301 | 1301 | <!-- PWSTRENGHT --> |
| 1302 | - <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1303 | - <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1302 | + <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1303 | + <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1304 | 1304 | <?php |
| 1305 | 1305 | } |
| 1306 | 1306 | } |
| 1307 | 1307 | ?> |
| 1308 | 1308 | <!-- functions --> |
| 1309 | - <script type="text/javascript" src="includes/js/functions.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1310 | - <script type="text/javascript" src="includes/js/CreateRandomString.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1309 | + <script type="text/javascript" src="includes/js/functions.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1310 | + <script type="text/javascript" src="includes/js/CreateRandomString.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1311 | 1311 | <input type="hidden" id="encryptClientServerStatus" value="<?php echo $SETTINGS['encryptClientServer'] ?? 1; ?>" /> |
| 1312 | 1312 | |
| 1313 | 1313 | </body> |
@@ -1397,65 +1397,65 @@ discard block |
||
| 1397 | 1397 | |
| 1398 | 1398 | // Load links, css and javascripts |
| 1399 | 1399 | if (isset($SETTINGS['cpassman_dir']) === true) { |
| 1400 | - include_once $SETTINGS['cpassman_dir'] . '/includes/core/load.js.php'; |
|
| 1400 | + include_once $SETTINGS['cpassman_dir'].'/includes/core/load.js.php'; |
|
| 1401 | 1401 | if ($menuAdmin === true) { |
| 1402 | - include_once $SETTINGS['cpassman_dir'] . '/pages/admin.js.php'; |
|
| 1402 | + include_once $SETTINGS['cpassman_dir'].'/pages/admin.js.php'; |
|
| 1403 | 1403 | if ($get['page'] === '2fa') { |
| 1404 | - include_once $SETTINGS['cpassman_dir'] . '/pages/2fa.js.php'; |
|
| 1404 | + include_once $SETTINGS['cpassman_dir'].'/pages/2fa.js.php'; |
|
| 1405 | 1405 | } elseif ($get['page'] === 'api') { |
| 1406 | - include_once $SETTINGS['cpassman_dir'] . '/pages/api.js.php'; |
|
| 1406 | + include_once $SETTINGS['cpassman_dir'].'/pages/api.js.php'; |
|
| 1407 | 1407 | } elseif ($get['page'] === 'backups') { |
| 1408 | - include_once $SETTINGS['cpassman_dir'] . '/pages/backups.js.php'; |
|
| 1408 | + include_once $SETTINGS['cpassman_dir'].'/pages/backups.js.php'; |
|
| 1409 | 1409 | } elseif ($get['page'] === 'emails') { |
| 1410 | - include_once $SETTINGS['cpassman_dir'] . '/pages/emails.js.php'; |
|
| 1410 | + include_once $SETTINGS['cpassman_dir'].'/pages/emails.js.php'; |
|
| 1411 | 1411 | } elseif ($get['page'] === 'ldap') { |
| 1412 | - include_once $SETTINGS['cpassman_dir'] . '/pages/ldap.js.php'; |
|
| 1412 | + include_once $SETTINGS['cpassman_dir'].'/pages/ldap.js.php'; |
|
| 1413 | 1413 | } elseif ($get['page'] === 'uploads') { |
| 1414 | - include_once $SETTINGS['cpassman_dir'] . '/pages/uploads.js.php'; |
|
| 1414 | + include_once $SETTINGS['cpassman_dir'].'/pages/uploads.js.php'; |
|
| 1415 | 1415 | } elseif ($get['page'] === 'fields') { |
| 1416 | - include_once $SETTINGS['cpassman_dir'] . '/pages/fields.js.php'; |
|
| 1416 | + include_once $SETTINGS['cpassman_dir'].'/pages/fields.js.php'; |
|
| 1417 | 1417 | } elseif ($get['page'] === 'options') { |
| 1418 | - include_once $SETTINGS['cpassman_dir'] . '/pages/options.js.php'; |
|
| 1418 | + include_once $SETTINGS['cpassman_dir'].'/pages/options.js.php'; |
|
| 1419 | 1419 | } elseif ($get['page'] === 'statistics') { |
| 1420 | - include_once $SETTINGS['cpassman_dir'] . '/pages/statistics.js.php'; |
|
| 1420 | + include_once $SETTINGS['cpassman_dir'].'/pages/statistics.js.php'; |
|
| 1421 | 1421 | } elseif ($get['page'] === 'tasks') { |
| 1422 | - include_once $SETTINGS['cpassman_dir'] . '/pages/tasks.js.php'; |
|
| 1422 | + include_once $SETTINGS['cpassman_dir'].'/pages/tasks.js.php'; |
|
| 1423 | 1423 | } elseif ($get['page'] === 'oauth' && WIP === true) { |
| 1424 | - include_once $SETTINGS['cpassman_dir'] . '/pages/oauth.js.php'; |
|
| 1424 | + include_once $SETTINGS['cpassman_dir'].'/pages/oauth.js.php'; |
|
| 1425 | 1425 | } elseif ($get['page'] === 'tools') { |
| 1426 | - include_once $SETTINGS['cpassman_dir'] . '/pages/tools.js.php'; |
|
| 1426 | + include_once $SETTINGS['cpassman_dir'].'/pages/tools.js.php'; |
|
| 1427 | 1427 | } |
| 1428 | 1428 | } elseif (isset($get['page']) === true && $get['page'] !== '') { |
| 1429 | 1429 | if ($get['page'] === 'items') { |
| 1430 | - include_once $SETTINGS['cpassman_dir'] . '/pages/items.js.php'; |
|
| 1430 | + include_once $SETTINGS['cpassman_dir'].'/pages/items.js.php'; |
|
| 1431 | 1431 | } elseif ($get['page'] === 'import') { |
| 1432 | - include_once $SETTINGS['cpassman_dir'] . '/pages/import.js.php'; |
|
| 1432 | + include_once $SETTINGS['cpassman_dir'].'/pages/import.js.php'; |
|
| 1433 | 1433 | } elseif ($get['page'] === 'export') { |
| 1434 | - include_once $SETTINGS['cpassman_dir'] . '/pages/export.js.php'; |
|
| 1434 | + include_once $SETTINGS['cpassman_dir'].'/pages/export.js.php'; |
|
| 1435 | 1435 | } elseif ($get['page'] === 'offline') { |
| 1436 | - include_once $SETTINGS['cpassman_dir'] . '/pages/offline.js.php'; |
|
| 1436 | + include_once $SETTINGS['cpassman_dir'].'/pages/offline.js.php'; |
|
| 1437 | 1437 | } elseif ($get['page'] === 'search') { |
| 1438 | - include_once $SETTINGS['cpassman_dir'] . '/pages/search.js.php'; |
|
| 1438 | + include_once $SETTINGS['cpassman_dir'].'/pages/search.js.php'; |
|
| 1439 | 1439 | } elseif ($get['page'] === 'profile') { |
| 1440 | - include_once $SETTINGS['cpassman_dir'] . '/pages/profile.js.php'; |
|
| 1440 | + include_once $SETTINGS['cpassman_dir'].'/pages/profile.js.php'; |
|
| 1441 | 1441 | } elseif ($get['page'] === 'favourites') { |
| 1442 | - include_once $SETTINGS['cpassman_dir'] . '/pages/favorites.js.php'; |
|
| 1442 | + include_once $SETTINGS['cpassman_dir'].'/pages/favorites.js.php'; |
|
| 1443 | 1443 | } elseif ($get['page'] === 'folders') { |
| 1444 | - include_once $SETTINGS['cpassman_dir'] . '/pages/folders.js.php'; |
|
| 1444 | + include_once $SETTINGS['cpassman_dir'].'/pages/folders.js.php'; |
|
| 1445 | 1445 | } elseif ($get['page'] === 'users') { |
| 1446 | - include_once $SETTINGS['cpassman_dir'] . '/pages/users.js.php'; |
|
| 1446 | + include_once $SETTINGS['cpassman_dir'].'/pages/users.js.php'; |
|
| 1447 | 1447 | } elseif ($get['page'] === 'roles') { |
| 1448 | - include_once $SETTINGS['cpassman_dir'] . '/pages/roles.js.php'; |
|
| 1448 | + include_once $SETTINGS['cpassman_dir'].'/pages/roles.js.php'; |
|
| 1449 | 1449 | } elseif ($get['page'] === 'utilities.deletion') { |
| 1450 | - include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.deletion.js.php'; |
|
| 1450 | + include_once $SETTINGS['cpassman_dir'].'/pages/utilities.deletion.js.php'; |
|
| 1451 | 1451 | } elseif ($get['page'] === 'utilities.logs') { |
| 1452 | - include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.logs.js.php'; |
|
| 1452 | + include_once $SETTINGS['cpassman_dir'].'/pages/utilities.logs.js.php'; |
|
| 1453 | 1453 | } elseif ($get['page'] === 'utilities.database') { |
| 1454 | - include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.database.js.php'; |
|
| 1454 | + include_once $SETTINGS['cpassman_dir'].'/pages/utilities.database.js.php'; |
|
| 1455 | 1455 | } elseif ($get['page'] === 'utilities.renewal') { |
| 1456 | - include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.renewal.js.php'; |
|
| 1456 | + include_once $SETTINGS['cpassman_dir'].'/pages/utilities.renewal.js.php'; |
|
| 1457 | 1457 | } |
| 1458 | 1458 | } else { |
| 1459 | - include_once $SETTINGS['cpassman_dir'] . '/includes/core/login.js.php'; |
|
| 1459 | + include_once $SETTINGS['cpassman_dir'].'/includes/core/login.js.php'; |
|
| 1460 | 1460 | } |
| 1461 | 1461 | } |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | ) { |
| 77 | 77 | // Not allowed page |
| 78 | 78 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 79 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 79 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 80 | 80 | exit; |
| 81 | 81 | } |
| 82 | 82 | |
@@ -118,19 +118,19 @@ discard block |
||
| 118 | 118 | $get_filename = str_replace('"', '\"', $get_filename); |
| 119 | 119 | |
| 120 | 120 | // Use Content-Disposition header with double quotes around filename |
| 121 | -header('Content-Disposition: attachment; filename="' . rawurldecode($get_filename) . '"'); |
|
| 121 | +header('Content-Disposition: attachment; filename="'.rawurldecode($get_filename).'"'); |
|
| 122 | 122 | header('Content-Type: application/octet-stream'); |
| 123 | 123 | header('Cache-Control: must-revalidate, no-cache, no-store'); |
| 124 | 124 | header('Expires: 0'); |
| 125 | 125 | if (null !== $request->query->get('pathIsFiles') && (int) $get_pathIsFiles === 1) { |
| 126 | - readfile($SETTINGS['path_to_files_folder'] . '/' . basename($get_filename)); |
|
| 126 | + readfile($SETTINGS['path_to_files_folder'].'/'.basename($get_filename)); |
|
| 127 | 127 | } else { |
| 128 | 128 | // get file key |
| 129 | 129 | $file_info = DB::queryfirstrow( |
| 130 | 130 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
| 131 | 131 | s.share_key AS share_key |
| 132 | - FROM ' . prefixTable('files') . ' AS f |
|
| 133 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 132 | + FROM ' . prefixTable('files').' AS f |
|
| 133 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 134 | 134 | WHERE s.user_id = %i AND s.object_id = %i', |
| 135 | 135 | $session->get('user-id'), |
| 136 | 136 | $get_fileid |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | // if not encrypted |
| 150 | 150 | $file_info = DB::queryfirstrow( |
| 151 | 151 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension |
| 152 | - FROM ' . prefixTable('files') . ' AS f |
|
| 152 | + FROM ' . prefixTable('files').' AS f |
|
| 153 | 153 | WHERE f.id = %i', |
| 154 | 154 | $get_fileid |
| 155 | 155 | ); |
@@ -159,25 +159,25 @@ discard block |
||
| 159 | 159 | // Set the filename of the download |
| 160 | 160 | $filename = basename($file_info['name'], '.'.$file_info['extension']); |
| 161 | 161 | $filename = isBase64($filename) === true ? base64_decode($filename) : $filename; |
| 162 | - $filename = $filename . '.' . $file_info['extension']; |
|
| 162 | + $filename = $filename.'.'.$file_info['extension']; |
|
| 163 | 163 | // Get the full path to the file to be downloaded |
| 164 | - if (file_exists($SETTINGS['path_to_upload_folder'] . '/' .TP_FILE_PREFIX . $file_info['file'])) { |
|
| 165 | - $filePath = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . $file_info['file']; |
|
| 164 | + if (file_exists($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.$file_info['file'])) { |
|
| 165 | + $filePath = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.$file_info['file']; |
|
| 166 | 166 | } else { |
| 167 | - $filePath = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file_info['file']); |
|
| 167 | + $filePath = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file_info['file']); |
|
| 168 | 168 | } |
| 169 | 169 | $filePath = realpath($filePath); |
| 170 | 170 | |
| 171 | - if (WIP === true) error_log('downloadFile.php: filePath: ' . $filePath." - "); |
|
| 171 | + if (WIP === true) error_log('downloadFile.php: filePath: '.$filePath." - "); |
|
| 172 | 172 | |
| 173 | 173 | if ($filePath && is_readable($filePath) && strpos($filePath, realpath($SETTINGS['path_to_upload_folder'])) === 0) { |
| 174 | 174 | header('Content-Description: File Transfer'); |
| 175 | 175 | header('Content-Type: application/octet-stream'); |
| 176 | - header('Content-Disposition: attachment; filename="' . basename($filename) . '"'); |
|
| 176 | + header('Content-Disposition: attachment; filename="'.basename($filename).'"'); |
|
| 177 | 177 | header('Expires: 0'); |
| 178 | 178 | header('Cache-Control: must-revalidate'); |
| 179 | 179 | header('Pragma: public'); |
| 180 | - header('Content-Length: ' . filesize($filePath)); |
|
| 180 | + header('Content-Length: '.filesize($filePath)); |
|
| 181 | 181 | flush(); // Clear system output buffer |
| 182 | 182 | if (empty($fileContent) === true) { |
| 183 | 183 | // deepcode ignore PT: File and path are secured directly inside the function decryptFile() |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | ) { |
| 81 | 81 | // Not allowed page |
| 82 | 82 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 83 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 83 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 84 | 84 | exit; |
| 85 | 85 | } |
| 86 | 86 | |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | } else { |
| 135 | 135 | // check if token is expired |
| 136 | 136 | $data = DB::queryFirstRow( |
| 137 | - 'SELECT end_timestamp FROM ' . prefixTable('tokens') . ' WHERE user_id = %i AND token = %s', |
|
| 137 | + 'SELECT end_timestamp FROM '.prefixTable('tokens').' WHERE user_id = %i AND token = %s', |
|
| 138 | 138 | $session->get('user-id'), |
| 139 | 139 | $post_user_token |
| 140 | 140 | ); |
@@ -158,12 +158,12 @@ discard block |
||
| 158 | 158 | |
| 159 | 159 | // HTTP headers for no cache etc |
| 160 | 160 | header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); |
| 161 | -header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); |
|
| 161 | +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); |
|
| 162 | 162 | header('Cache-Control: no-store, no-cache, must-revalidate'); |
| 163 | 163 | header('Cache-Control: post-check=0, pre-check=0', false); |
| 164 | 164 | |
| 165 | 165 | if (null !== $post_type_upload && $post_type_upload === 'upload_profile_photo') { |
| 166 | - $targetDir = realpath($SETTINGS['cpassman_dir'] . '/includes/avatars'); |
|
| 166 | + $targetDir = realpath($SETTINGS['cpassman_dir'].'/includes/avatars'); |
|
| 167 | 167 | } else { |
| 168 | 168 | $targetDir = realpath($SETTINGS['path_to_files_folder']); |
| 169 | 169 | } |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | $file_name = preg_replace('/[^a-zA-Z0-9-_\.]/', '', strtolower(basename($file->getClientOriginalName()))); |
| 217 | 217 | |
| 218 | 218 | if (strlen($file_name) == 0 || strlen($file_name) > $MAX_FILENAME_LENGTH) { |
| 219 | - error_log('Invalid file name: ' . $file_name . '.'); |
|
| 219 | + error_log('Invalid file name: '.$file_name.'.'); |
|
| 220 | 220 | echo handleUploadError('Invalid file name provided.'); |
| 221 | 221 | return false; |
| 222 | 222 | } |
@@ -230,12 +230,12 @@ discard block |
||
| 230 | 230 | $ext = strtolower($ext); |
| 231 | 231 | } else { |
| 232 | 232 | // Case where the file extension is not a string |
| 233 | - error_log('Invalid file name: ' . $file_name . '.'); |
|
| 233 | + error_log('Invalid file name: '.$file_name.'.'); |
|
| 234 | 234 | echo handleUploadError('Invalid file extension.'); |
| 235 | 235 | } |
| 236 | 236 | } else { |
| 237 | 237 | // Case where the file name is not a string |
| 238 | - error_log('Invalid file name: ' . $file_name . '.'); |
|
| 238 | + error_log('Invalid file name: '.$file_name.'.'); |
|
| 239 | 239 | echo handleUploadError('Invalid file.'); |
| 240 | 240 | return false; |
| 241 | 241 | } |
@@ -243,8 +243,8 @@ discard block |
||
| 243 | 243 | // Validate against a list of allowed extensions |
| 244 | 244 | $allowed_extensions = explode( |
| 245 | 245 | ',', |
| 246 | - $SETTINGS['upload_docext'] . ',' . $SETTINGS['upload_imagesext'] . |
|
| 247 | - ',' . $SETTINGS['upload_pkgext'] . ',' . $SETTINGS['upload_otherext'] |
|
| 246 | + $SETTINGS['upload_docext'].','.$SETTINGS['upload_imagesext']. |
|
| 247 | + ','.$SETTINGS['upload_pkgext'].','.$SETTINGS['upload_otherext'] |
|
| 248 | 248 | ); |
| 249 | 249 | if ( |
| 250 | 250 | !in_array($ext, $allowed_extensions) |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | try { |
| 262 | 262 | $file->move($destinationPath, $file_name); |
| 263 | 263 | } catch (FileException $e) { |
| 264 | - error_log('File upload error: ' . $e->getMessage()); |
|
| 264 | + error_log('File upload error: '.$e->getMessage()); |
|
| 265 | 265 | echo handleUploadError('File upload failed. Please try again.'); |
| 266 | 266 | return false; |
| 267 | 267 | } |
@@ -272,24 +272,24 @@ discard block |
||
| 272 | 272 | |
| 273 | 273 | // is destination folder writable |
| 274 | 274 | if (is_writable($SETTINGS['path_to_files_folder']) === false) { |
| 275 | - echo handleUploadError('Not enough permissions on folder ' . $SETTINGS['path_to_files_folder'] . '.'); |
|
| 275 | + echo handleUploadError('Not enough permissions on folder '.$SETTINGS['path_to_files_folder'].'.'); |
|
| 276 | 276 | return false; |
| 277 | 277 | } |
| 278 | 278 | |
| 279 | 279 | // Make sure the fileName is unique but only if chunking is disabled |
| 280 | -if ($chunks < 2 && file_exists($targetDir . DIRECTORY_SEPARATOR . $fileName)) { |
|
| 280 | +if ($chunks < 2 && file_exists($targetDir.DIRECTORY_SEPARATOR.$fileName)) { |
|
| 281 | 281 | $fileNameA = substr($fileName, 0, strlen($ext)); |
| 282 | 282 | $fileNameB = substr($fileName, strlen($ext)); |
| 283 | 283 | |
| 284 | 284 | $count = 1; |
| 285 | - while (file_exists($targetDir . DIRECTORY_SEPARATOR . $fileNameA . '_' . $count . $fileNameB)) { |
|
| 285 | + while (file_exists($targetDir.DIRECTORY_SEPARATOR.$fileNameA.'_'.$count.$fileNameB)) { |
|
| 286 | 286 | ++$count; |
| 287 | 287 | } |
| 288 | 288 | |
| 289 | - $fileName = $fileNameA . '_' . $count . $fileNameB; |
|
| 289 | + $fileName = $fileNameA.'_'.$count.$fileNameB; |
|
| 290 | 290 | } |
| 291 | 291 | |
| 292 | -$filePath = $targetDir . DIRECTORY_SEPARATOR . $fileName; |
|
| 292 | +$filePath = $targetDir.DIRECTORY_SEPARATOR.$fileName; |
|
| 293 | 293 | |
| 294 | 294 | // Create target dir |
| 295 | 295 | if (!file_exists($targetDir)) { |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | // Remove old temp files |
| 304 | 304 | if ($cleanupTargetDir && is_dir($targetDir) && ($dir = opendir($targetDir))) { |
| 305 | 305 | while (($fileClean = readdir($dir)) !== false) { |
| 306 | - $tmpfilePath = $targetDir . DIRECTORY_SEPARATOR . $fileClean; |
|
| 306 | + $tmpfilePath = $targetDir.DIRECTORY_SEPARATOR.$fileClean; |
|
| 307 | 307 | |
| 308 | 308 | // Remove temp file if it is older than the max age and is not the current file |
| 309 | 309 | if ( |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | |
| 318 | 318 | closedir($dir); |
| 319 | 319 | } else { |
| 320 | - echo handleUploadError('Not enough permissions on folder ' . $SETTINGS['path_to_files_folder'] . '.'); |
|
| 320 | + echo handleUploadError('Not enough permissions on folder '.$SETTINGS['path_to_files_folder'].'.'); |
|
| 321 | 321 | return false; |
| 322 | 322 | } |
| 323 | 323 | |
@@ -366,11 +366,11 @@ discard block |
||
| 366 | 366 | } catch (FileException $e) { |
| 367 | 367 | // On error log |
| 368 | 368 | error_log($e->getMessage()); |
| 369 | - echo handleUploadError('File processing failed: ' . $e->getMessage()); |
|
| 369 | + echo handleUploadError('File processing failed: '.$e->getMessage()); |
|
| 370 | 370 | return false; |
| 371 | 371 | } |
| 372 | 372 | } else { |
| 373 | - echo handleUploadError('Failed to move uploaded file to ' . $SETTINGS['path_to_files_folder'] . '.'); |
|
| 373 | + echo handleUploadError('Failed to move uploaded file to '.$SETTINGS['path_to_files_folder'].'.'); |
|
| 374 | 374 | return false; |
| 375 | 375 | } |
| 376 | 376 | } else { |
@@ -386,14 +386,14 @@ discard block |
||
| 386 | 386 | fwrite($out, $buff); |
| 387 | 387 | } |
| 388 | 388 | } else { |
| 389 | - echo handleUploadError('Failed to open input stream ' . $SETTINGS['path_to_files_folder'] . '.'); |
|
| 389 | + echo handleUploadError('Failed to open input stream '.$SETTINGS['path_to_files_folder'].'.'); |
|
| 390 | 390 | return false; |
| 391 | 391 | } |
| 392 | 392 | |
| 393 | 393 | fclose($in); |
| 394 | 394 | fclose($out); |
| 395 | 395 | } else { |
| 396 | - echo handleUploadError('Failed to open output stream ' . $SETTINGS['path_to_files_folder'] . '.'); |
|
| 396 | + echo handleUploadError('Failed to open output stream '.$SETTINGS['path_to_files_folder'].'.'); |
|
| 397 | 397 | return false; |
| 398 | 398 | } |
| 399 | 399 | } |
@@ -418,7 +418,7 @@ discard block |
||
| 418 | 418 | ) { |
| 419 | 419 | rename( |
| 420 | 420 | $filePath, |
| 421 | - $targetDir . DIRECTORY_SEPARATOR . $newFileName |
|
| 421 | + $targetDir.DIRECTORY_SEPARATOR.$newFileName |
|
| 422 | 422 | ); |
| 423 | 423 | |
| 424 | 424 | // Add in DB |
@@ -447,7 +447,7 @@ discard block |
||
| 447 | 447 | ) { |
| 448 | 448 | rename( |
| 449 | 449 | $filePath, |
| 450 | - $targetDir . DIRECTORY_SEPARATOR . $newFileName |
|
| 450 | + $targetDir.DIRECTORY_SEPARATOR.$newFileName |
|
| 451 | 451 | ); |
| 452 | 452 | |
| 453 | 453 | // Add in DB |
@@ -480,13 +480,13 @@ discard block |
||
| 480 | 480 | // rename the file |
| 481 | 481 | rename( |
| 482 | 482 | $filePath, |
| 483 | - $targetDir . DIRECTORY_SEPARATOR . $newFileName . '.' . $ext |
|
| 483 | + $targetDir.DIRECTORY_SEPARATOR.$newFileName.'.'.$ext |
|
| 484 | 484 | ); |
| 485 | 485 | |
| 486 | 486 | // make thumbnail |
| 487 | 487 | $ret = makeThumbnail( |
| 488 | - $targetDir . DIRECTORY_SEPARATOR . $newFileName . '.' . $ext, |
|
| 489 | - $targetDir . DIRECTORY_SEPARATOR . $newFileName . '_thumb' . '.' . $ext, |
|
| 488 | + $targetDir.DIRECTORY_SEPARATOR.$newFileName.'.'.$ext, |
|
| 489 | + $targetDir.DIRECTORY_SEPARATOR.$newFileName.'_thumb'.'.'.$ext, |
|
| 490 | 490 | 40 |
| 491 | 491 | ); |
| 492 | 492 | |
@@ -498,21 +498,21 @@ discard block |
||
| 498 | 498 | } |
| 499 | 499 | |
| 500 | 500 | // get current avatar and delete it |
| 501 | - $data = DB::queryFirstRow('SELECT avatar, avatar_thumb FROM ' . prefixTable('users') . ' WHERE id=%i', $session->get('user-id')); |
|
| 502 | - fileDelete($targetDir . DIRECTORY_SEPARATOR . $data['avatar'], $SETTINGS); |
|
| 503 | - fileDelete($targetDir . DIRECTORY_SEPARATOR . $data['avatar_thumb'], $SETTINGS); |
|
| 501 | + $data = DB::queryFirstRow('SELECT avatar, avatar_thumb FROM '.prefixTable('users').' WHERE id=%i', $session->get('user-id')); |
|
| 502 | + fileDelete($targetDir.DIRECTORY_SEPARATOR.$data['avatar'], $SETTINGS); |
|
| 503 | + fileDelete($targetDir.DIRECTORY_SEPARATOR.$data['avatar_thumb'], $SETTINGS); |
|
| 504 | 504 | |
| 505 | 505 | // store in DB the new avatar |
| 506 | 506 | DB::query( |
| 507 | - 'UPDATE ' . prefixTable('users') . " |
|
| 508 | - SET avatar='" . $newFileName . '.' . $ext . "', avatar_thumb='" . $newFileName . '_thumb' . '.' . $ext . "' |
|
| 507 | + 'UPDATE '.prefixTable('users')." |
|
| 508 | + SET avatar='" . $newFileName.'.'.$ext."', avatar_thumb='".$newFileName.'_thumb'.'.'.$ext."' |
|
| 509 | 509 | WHERE id=%i", |
| 510 | 510 | $session->get('user-id') |
| 511 | 511 | ); |
| 512 | 512 | |
| 513 | 513 | // store in session |
| 514 | - $session->set('user-avatar', $newFileName . '.' . $ext); |
|
| 515 | - $session->set('user-avatar_thumb', $newFileName . '_thumb' . '.' . $ext); |
|
| 514 | + $session->set('user-avatar', $newFileName.'.'.$ext); |
|
| 515 | + $session->set('user-avatar_thumb', $newFileName.'_thumb'.'.'.$ext); |
|
| 516 | 516 | |
| 517 | 517 | // return info |
| 518 | 518 | echo prepareExchangedData( |
@@ -531,7 +531,7 @@ discard block |
||
| 531 | 531 | ) { |
| 532 | 532 | rename( |
| 533 | 533 | $filePath, |
| 534 | - $targetDir . DIRECTORY_SEPARATOR . $newFileName |
|
| 534 | + $targetDir.DIRECTORY_SEPARATOR.$newFileName |
|
| 535 | 535 | ); |
| 536 | 536 | |
| 537 | 537 | // Add in DB |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | function purgeTemporaryFiles(): void |
| 72 | 72 | { |
| 73 | 73 | // Load expected files |
| 74 | - require_once __DIR__. '/../sources/main.functions.php'; |
|
| 74 | + require_once __DIR__.'/../sources/main.functions.php'; |
|
| 75 | 75 | |
| 76 | 76 | // Verify if $SETTINGS is defined |
| 77 | 77 | if (isset($SETTINGS) === false) { |
@@ -85,8 +85,8 @@ discard block |
||
| 85 | 85 | //delete file FILES |
| 86 | 86 | while (false !== ($f = readdir($dir))) { |
| 87 | 87 | if ($f !== '.' && $f !== '..' && $f !== '.htaccess') { |
| 88 | - if (file_exists($dir . $f) && ((time() - filectime($dir . $f)) > 604800)) { |
|
| 89 | - fileDelete($dir . '/' . $f, $SETTINGS); |
|
| 88 | + if (file_exists($dir.$f) && ((time() - filectime($dir.$f)) > 604800)) { |
|
| 89 | + fileDelete($dir.'/'.$f, $SETTINGS); |
|
| 90 | 90 | } |
| 91 | 91 | } |
| 92 | 92 | } |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | while (false !== ($f = readdir($dir))) { |
| 106 | 106 | if ($f !== '.' && $f !== '..') { |
| 107 | 107 | if (strpos($f, '_delete.') > 0) { |
| 108 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $f, $SETTINGS); |
|
| 108 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.$f, $SETTINGS); |
|
| 109 | 109 | } |
| 110 | 110 | } |
| 111 | 111 | } |
@@ -37,45 +37,45 @@ discard block |
||
| 37 | 37 | * @return boolean |
| 38 | 38 | */ |
| 39 | 39 | function is_jwt_valid($jwt) { |
| 40 | - try { |
|
| 41 | - $decoded = (array) JWT::decode($jwt, new Key(DB_PASSWD, 'HS256')); |
|
| 40 | + try { |
|
| 41 | + $decoded = (array) JWT::decode($jwt, new Key(DB_PASSWD, 'HS256')); |
|
| 42 | 42 | |
| 43 | - // Check if expiration is reached |
|
| 44 | - if ($decoded['exp'] - time() < 0) { |
|
| 45 | - return false; |
|
| 46 | - } |
|
| 43 | + // Check if expiration is reached |
|
| 44 | + if ($decoded['exp'] - time() < 0) { |
|
| 45 | + return false; |
|
| 46 | + } |
|
| 47 | 47 | /* |
| 48 | 48 | $decoded1 = JWT::decode($jwt, new Key(DB_PASSWD, 'HS256'), $headers = new stdClass()); |
| 49 | 49 | print_r($headers); |
| 50 | 50 | */ |
| 51 | 51 | |
| 52 | - return true; |
|
| 53 | - } catch (InvalidArgumentException $e) { |
|
| 54 | - // provided key/key-array is empty or malformed. |
|
| 55 | - return false; |
|
| 56 | - } catch (DomainException $e) { |
|
| 57 | - // provided algorithm is unsupported OR |
|
| 58 | - // provided key is invalid OR |
|
| 59 | - // unknown error thrown in openSSL or libsodium OR |
|
| 60 | - // libsodium is required but not available. |
|
| 61 | - return false; |
|
| 62 | - } catch (SignatureInvalidException $e) { |
|
| 63 | - // provided JWT signature verification failed. |
|
| 64 | - return false; |
|
| 65 | - } catch (BeforeValidException $e) { |
|
| 66 | - // provided JWT is trying to be used before "nbf" claim OR |
|
| 67 | - // provided JWT is trying to be used before "iat" claim. |
|
| 68 | - return false; |
|
| 69 | - } catch (ExpiredException $e) { |
|
| 70 | - // provided JWT is trying to be used after "exp" claim. |
|
| 71 | - return false; |
|
| 72 | - } catch (UnexpectedValueException $e) { |
|
| 73 | - // provided JWT is malformed OR |
|
| 74 | - // provided JWT is missing an algorithm / using an unsupported algorithm OR |
|
| 75 | - // provided JWT algorithm does not match provided key OR |
|
| 76 | - // provided key ID in key/key-array is empty or invalid. |
|
| 77 | - return false; |
|
| 78 | - } |
|
| 52 | + return true; |
|
| 53 | + } catch (InvalidArgumentException $e) { |
|
| 54 | + // provided key/key-array is empty or malformed. |
|
| 55 | + return false; |
|
| 56 | + } catch (DomainException $e) { |
|
| 57 | + // provided algorithm is unsupported OR |
|
| 58 | + // provided key is invalid OR |
|
| 59 | + // unknown error thrown in openSSL or libsodium OR |
|
| 60 | + // libsodium is required but not available. |
|
| 61 | + return false; |
|
| 62 | + } catch (SignatureInvalidException $e) { |
|
| 63 | + // provided JWT signature verification failed. |
|
| 64 | + return false; |
|
| 65 | + } catch (BeforeValidException $e) { |
|
| 66 | + // provided JWT is trying to be used before "nbf" claim OR |
|
| 67 | + // provided JWT is trying to be used before "iat" claim. |
|
| 68 | + return false; |
|
| 69 | + } catch (ExpiredException $e) { |
|
| 70 | + // provided JWT is trying to be used after "exp" claim. |
|
| 71 | + return false; |
|
| 72 | + } catch (UnexpectedValueException $e) { |
|
| 73 | + // provided JWT is malformed OR |
|
| 74 | + // provided JWT is missing an algorithm / using an unsupported algorithm OR |
|
| 75 | + // provided JWT algorithm does not match provided key OR |
|
| 76 | + // provided key ID in key/key-array is empty or invalid. |
|
| 77 | + return false; |
|
| 78 | + } |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | function base64url_encode($data) { |
@@ -84,24 +84,24 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | function get_authorization_header() |
| 86 | 86 | { |
| 87 | - $request = symfonyRequest::createFromGlobals(); |
|
| 88 | - $authorizationHeader = $request->headers->get('Authorization'); |
|
| 89 | - $headers = null; |
|
| 87 | + $request = symfonyRequest::createFromGlobals(); |
|
| 88 | + $authorizationHeader = $request->headers->get('Authorization'); |
|
| 89 | + $headers = null; |
|
| 90 | 90 | |
| 91 | - // Check if the authorization header is not empty |
|
| 92 | - if (!empty($authorizationHeader)) { |
|
| 93 | - $headers = trim($authorizationHeader); |
|
| 94 | - } else if (function_exists('apache_request_headers') === true) { |
|
| 95 | - $requestHeaders = (array) apache_request_headers(); |
|
| 96 | - // Server-side fix for bug in old Android versions (a nice side-effect of this fix means we don't care about capitalization for Authorization) |
|
| 97 | - $requestHeaders = array_combine(array_map('ucwords', array_keys($requestHeaders)), array_values($requestHeaders)); |
|
| 98 | - //print_r($requestHeaders); |
|
| 99 | - if (isset($requestHeaders['Authorization']) === true) { |
|
| 100 | - $headers = trim($requestHeaders['Authorization']); |
|
| 101 | - } |
|
| 102 | - } |
|
| 91 | + // Check if the authorization header is not empty |
|
| 92 | + if (!empty($authorizationHeader)) { |
|
| 93 | + $headers = trim($authorizationHeader); |
|
| 94 | + } else if (function_exists('apache_request_headers') === true) { |
|
| 95 | + $requestHeaders = (array) apache_request_headers(); |
|
| 96 | + // Server-side fix for bug in old Android versions (a nice side-effect of this fix means we don't care about capitalization for Authorization) |
|
| 97 | + $requestHeaders = array_combine(array_map('ucwords', array_keys($requestHeaders)), array_values($requestHeaders)); |
|
| 98 | + //print_r($requestHeaders); |
|
| 99 | + if (isset($requestHeaders['Authorization']) === true) { |
|
| 100 | + $headers = trim($requestHeaders['Authorization']); |
|
| 101 | + } |
|
| 102 | + } |
|
| 103 | 103 | |
| 104 | - return $headers; |
|
| 104 | + return $headers; |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | function get_bearer_token() { |
@@ -118,8 +118,8 @@ discard block |
||
| 118 | 118 | |
| 119 | 119 | function get_bearer_data($jwt) { |
| 120 | 120 | // split the jwt |
| 121 | - $tokenParts = explode('.', $jwt); |
|
| 122 | - $payload = base64_decode($tokenParts[1]); |
|
| 121 | + $tokenParts = explode('.', $jwt); |
|
| 122 | + $payload = base64_decode($tokenParts[1]); |
|
| 123 | 123 | |
| 124 | 124 | // HEADER: Get the access token from the header |
| 125 | 125 | if (empty($payload) === false) { |
@@ -39,13 +39,13 @@ discard block |
||
| 39 | 39 | header("Access-Control-Allow-Methods: POST, GET"); |
| 40 | 40 | header("Access-Control-Max-Age: 3600"); |
| 41 | 41 | header("Access-Control-Allow-Headers: Content-Type, Access-Control-Allow-Headers, Authorization, X-Requested-With"); |
| 42 | -require __DIR__ . "/inc/bootstrap.php"; |
|
| 42 | +require __DIR__."/inc/bootstrap.php"; |
|
| 43 | 43 | |
| 44 | 44 | // sanitize url segments |
| 45 | 45 | $base = new BaseController(); |
| 46 | 46 | $uri = $base->getUriSegments(); |
| 47 | 47 | if (!is_array($uri)) { |
| 48 | - $uri = [$uri]; // ensure $uril is table |
|
| 48 | + $uri = [$uri]; // ensure $uril is table |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | // Prepare DB password |
@@ -61,9 +61,9 @@ discard block |
||
| 61 | 61 | if ($uri[0] === 'authorize') { |
| 62 | 62 | // Is API enabled in Teampass settings |
| 63 | 63 | if ($apiStatus['error'] === false) { |
| 64 | - require API_ROOT_PATH . "/Controller/Api/AuthController.php"; |
|
| 64 | + require API_ROOT_PATH."/Controller/Api/AuthController.php"; |
|
| 65 | 65 | $objFeedController = new AuthController(); |
| 66 | - $strMethodName = $uri[0] . 'Action'; |
|
| 66 | + $strMethodName = $uri[0].'Action'; |
|
| 67 | 67 | $objFeedController->{$strMethodName}(); |
| 68 | 68 | } else { |
| 69 | 69 | // Error management |
@@ -89,9 +89,9 @@ discard block |
||
| 89 | 89 | |
| 90 | 90 | // action related to USER |
| 91 | 91 | } elseif ($controller === 'user') { |
| 92 | - require API_ROOT_PATH . "/Controller/Api/UserController.php"; |
|
| 92 | + require API_ROOT_PATH."/Controller/Api/UserController.php"; |
|
| 93 | 93 | $objFeedController = new UserController(); |
| 94 | - $strMethodName = (string) $action . 'Action'; |
|
| 94 | + $strMethodName = (string) $action.'Action'; |
|
| 95 | 95 | $objFeedController->{$strMethodName}(); |
| 96 | 96 | |
| 97 | 97 | // action related to ITEM |