| @@ -1,12 +1,12 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | 3 | * @package FireBox |
| 4 | - * @version 1.0.11 Free | |
| 4 | + * @version 2.0.12 Free | |
| 5 | 5 | * |
| 6 | 6 | * @author FirePlugins <info@fireplugins.com> |
| 7 | 7 | * @link https://www.fireplugins.com |
| 8 | - * @copyright Copyright © 2022 FirePlugins All Rights Reserved | |
| 8 | + * @copyright Copyright © 2023 FirePlugins All Rights Reserved | |
| 9 | 9 | * @license GNU GPLv3 <http://www.gnu.org/licenses/gpl.html> or later |
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | 12 | namespace FireBox\Core\Admin\Analytics; |
| @@ -36,9 +36,9 @@ | ||
| 36 | 36 | { |
| 37 | 37 | return []; |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - return firebox()->tables->box->getResults($payload); | |
| 40 | + return firebox()->tables->box->getResults($payload, true, false); | |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | /** |
| 44 | 44 | * Returns results from the database given a payload |
| @@ -57,8 +57,23 @@ | ||
| 57 | 57 | if (!isset($payload['select'])) |
| 58 | 58 | { |
| 59 | 59 | return []; |
| 60 | 60 | } |
| 61 | + | |
| 62 | + $table = $this->getTable($payload, 'boxlog'); | |
| 61 | 63 | |
| 62 | - return firebox()->tables->boxlog->getResults($payload); | |
| 64 | + return firebox()->tables->$table->getResults($payload, true, false, ARRAY_A); | |
| 65 | + } | |
| 66 | + | |
| 67 | + /** | |
| 68 | + * Returns the table to fetch data. | |
| 69 | + * | |
| 70 | + * @param array $payload | |
| 71 | + * @param string $fallback | |
| 72 | + * | |
| 73 | + * @return string | |
| 74 | + */ | |
| 75 | + private function getTable($payload = [], $fallback = '') | |
| 76 | + { | |
| 77 | + return isset($payload['table']) && !empty($payload['table']) ? $payload['table'] : $fallback; | |
| 63 | 78 | } |
| 64 | 79 | } |