Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
ba1a12a
feat: glpi 12 compatibility
btry Sep 1, 2026
c6a06df
feat: drop deprecated CSRF token
btry Sep 3, 2026
dd77614
fix: truncate table with bad WHERE clause
btry Sep 3, 2026
2a92c85
feat: disable useless DB version check
btry Sep 3, 2026
c62f8c6
docs(security): update
btry Sep 3, 2026
a14d839
test: remove useless attributes
btry Sep 3, 2026
5087ed8
test: fix wrong function name
btry Sep 3, 2026
a62bc99
docs(test): document array
btry Sep 3, 2026
dc5a739
feat(Config): compatibility with GLPI 12
btry Sep 3, 2026
4a4139b
fix(SearchOptions): use subquery object instead of raw SQL
btry Sep 4, 2026
509673a
chore(dependencies): update dependencies
btry Sep 4, 2026
af0ff6c
test: fix phpunit notices
btry Sep 4, 2026
c6858fe
test: remove deprecated attributes fir phpunit
btry Sep 4, 2026
28bdb74
fix(install): newline after completing fallback data installation
btry Sep 4, 2026
251c8f0
chore: remove obsolete dependency
btry Sep 4, 2026
e94e3a7
chore: add Makefile
btry Sep 8, 2026
617e0f7
feat: GLPI 12 compatibility
btry Sep 8, 2026
df7587d
fix(Config): set icon
btry Sep 11, 2026
fcfccf0
feat(DataSource/RestApiClient): use GLPI HTTP client instead of Guzzle
btry Sep 11, 2026
f464ec5
feat(Datasource/AbstractCrontask): give link to enable zones
btry Sep 11, 2026
c8a7c29
chore: update package
btry Sep 15, 2026
98428ec
docs(SECURITY): fix plugin name mention
btry Sep 24, 2026
d8383e2
refacror(Config): use constant for context
btry Sep 24, 2026
0d352ed
chore: drop obsolete dependencies
btry Sep 24, 2026
ffc7cf7
chore: remove conventional changelog
btry Sep 24, 2026
18e366a
docs: typo
btry Sep 24, 2026
0c81203
test: code cleanup
btry Jun 25, 2026
cbfd9e2
feat(Impact\Embodied\Boavizta): support for cloud servers
btry Jun 25, 2026
60d7d74
ff
btry Jul 3, 2026
5a7c2c7
fix(CarbonIntensity): limit downloads only if the limit is set
btry Jul 1, 2026
808f574
fix(DataSource\CarbonIntensity): cache only if the extended range end…
btry Jul 1, 2026
d9269d8
refactor(Impact\Embodied\Boavizta): factorize null usage representation
btry Jul 1, 2026
2304d06
style(Dashboard\Dashboard): dead code cleanup
btry Jul 1, 2026
75acd29
fix(Impact\History\Computer): more accurate status
btry Sep 25, 2026
4120b0b
fix(Zone): remove deprecated include
btry Sep 25, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
name: "Generate CI matrix"
uses: "glpi-project/plugin-ci-workflows/.github/workflows/generate-ci-matrix.yml@v1"
with:
glpi-version: "11.0.x"
glpi-version: "12.0.x"
ci:
name: "GLPI ${{ matrix.glpi-version }} - php:${{ matrix.php-version }} - ${{ matrix.db-image }}"
needs: "generate-ci-matrix"
Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include ../../PluginsMakefile.mk

6 changes: 4 additions & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ Once the report will be handled, and if the issue is not yet fixed (or in progre
we'll add it to the GitHub security tab, and add you as observer. Meanwhile,
you will reserve a CVE for the issue.

Thank you for improving the security of glpi-agent.
Thank you for improving the security of the plugin Carbon.

## Supported Versions

| Version | Supported |
| ------- | ------------------ |
| 1.0.x | :heavy_check_mark: |
| 1.0.x | :x: |
| 1.2.x | :x: |
| 1.3.x | :heavy_check_mark: |
| 1.3.x | :heavy_check_mark: |
| 1.4.x | :heavy_check_mark: |
15 changes: 5 additions & 10 deletions ajax/dropdownZone.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,16 @@
*
* -------------------------------------------------------------------------
*/

use Glpi\Exception\Http\AccessDeniedHttpException;
use Glpi\Exception\Http\NotFoundHttpException;
use GlpiPlugin\Carbon\Source_Zone;
use GlpiPlugin\Carbon\Zone;

include(__DIR__ . '/../../../inc/includes.php');

// Check if plugin is activated...
if (!Plugin::isPluginActive('carbon')) {
http_response_code(404);
die();
}

if (!Zone::canView()) {
http_response_code(403);
die();
throw new NotFoundHttpException();
} elseif (!Zone::canView()) {
throw new AccessDeniedHttpException();
}

$source_zone_table = Source_Zone::getTable();
Expand Down
10 changes: 2 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,7 @@
"php": ">=8.2.0",
"geocoder-php/google-maps-provider": "^4.7",
"geocoder-php/nominatim-provider": "^5.7",
"league/iso3166": "^4.3",
"php-http/message": "^1.16",
"php-http/message-factory": "^1.1"
},
"require-dev": {
"glpi-project/tools": "^0.8.1",
"marcocesarato/php-conventional-changelog": "^1.17"
"league/iso3166": "^4.3"
},
"config": {
"optimize-autoloader": true,
Expand All @@ -35,5 +29,5 @@
"license-headers": "vendor/bin/licence-headers-check --ansi --no-interaction",
"build-schema": "tools/build-db-schema.php carbon | plantuml -p -tpng > docs/db-schema.png"
},
"version": "1.3.0-dev"
"version": "1.4.0-dev"
}
Loading
Loading