Skip to content

Commit bdc81ec

Browse files
author
yllen
committed
create tag 1.14.0
git-svn-id: https://forge.glpi-project.org/svn/reports/tags/1.14.0-GLPI_9.5@386 8dedd86a-f2e1-4d8f-975f-694e9cd39626
1 parent d5666cc commit bdc81ec

78 files changed

Lines changed: 437 additions & 285 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎front/config.form.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
2222
@package reports
2323
@authors Nelly Mahu-Lasson, Remi Collet, Alexandre Delaunay
24-
@copyright Copyright (c) 2009-2019 Reports plugin team
24+
@copyright Copyright (c) 2009-2020 Reports plugin team
2525
@license AGPL License 3.0 or (at your option) any later version
2626
http://www.gnu.org/licenses/agpl-3.0-standalone.html
2727
@link https://forge.glpi-project.org/projects/reports

‎front/report.form.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
2222
@package reports
2323
@authors Nelly Mahu-Lasson, Remi Collet, Alexandre Delaunay
24-
@copyright Copyright (c) 2009-2019 Reports plugin team
24+
@copyright Copyright (c) 2009-2020 Reports plugin team
2525
@license AGPL License 3.0 or (at your option) any later version
2626
http://www.gnu.org/licenses/agpl-3.0-standalone.html
2727
@link https://forge.glpi-project.org/projects/reports

‎hook.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ function plugin_reports_install() {
6262
}
6363

6464
// No autoload when plugin is not activated
65-
include_once (GLPI_ROOT."/plugins/reports/inc/profile.class.php");
65+
include_once (Plugin::getPhpDir('reports')."/inc/profile.class.php");
6666

6767
PluginReportsProfile::install($migration);
6868

@@ -77,7 +77,7 @@ function plugin_reports_uninstall() {
7777
$migration = new Migration('1.13.0');
7878

7979
// No autoload when plugin is not activated (if dessactivation before uninstall)
80-
include_once (GLPI_ROOT."/plugins/reports/inc/profile.class.php");
80+
include_once (Plugin::getPhpDir('reports')."/inc/profile.class.php");
8181

8282
return PluginReportsProfile::uninstall($migration);
8383

‎inc/arraycriteria.class.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
2222
@package reports
2323
@authors Nelly Mahu-Lasson, Remi Collet, Alexandre Delaunay
24-
@copyright Copyright (c) 2009-2019 Reports plugin team
24+
@copyright Copyright (c) 2009-2020 Reports plugin team
2525
@license AGPL License 3.0 or (at your option) any later version
2626
http://www.gnu.org/licenses/agpl-3.0-standalone.html
2727
@link https://forge.glpi-project.org/projects/reports

‎inc/autocriteria.class.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
2222
@package reports
2323
@authors Nelly Mahu-Lasson, Remi Collet, Alexandre Delaunay
24-
@copyright Copyright (c) 2009-2019 Reports plugin team
24+
@copyright Copyright (c) 2009-2020 Reports plugin team
2525
@license AGPL License 3.0 or (at your option) any later version
2626
http://www.gnu.org/licenses/agpl-3.0-standalone.html
2727
@link https://forge.glpi-project.org/projects/reports

‎inc/autoreport.class.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
2222
@package reports
2323
@authors Nelly Mahu-Lasson, Remi Collet, Alexandre Delaunay
24-
@copyright Copyright (c) 2009-2019 Reports plugin team
24+
@copyright Copyright (c) 2009-2020 Reports plugin team
2525
@license AGPL License 3.0 or (at your option) any later version
2626
http://www.gnu.org/licenses/agpl-3.0-standalone.html
2727
@link https://forge.glpi-project.org/projects/reports
@@ -312,7 +312,7 @@ function execute($options=[]) {
312312
}
313313
}
314314

315-
$nbcols = $DB->num_fields($res);
315+
$nbcols = $DB->numFields($res);
316316
$nbrows = $DB->numrows($res);
317317

318318
echo Search::showHeader($output_type, $nbrows, $nbcols, true);
@@ -322,7 +322,7 @@ function execute($options=[]) {
322322
// fill $sqlcols with default sql query fields so we can validate $columns
323323
$sqlcols = [];
324324
for ($i = 0 ; $i < $nbcols ; $i++) {
325-
$colname = $DB->field_name($res, $i);
325+
$colname = $DB->fieldName($res, $i);
326326
$sqlcols[] = $colname;
327327
}
328328
$colsname = [];
@@ -346,7 +346,7 @@ function execute($options=[]) {
346346
echo Search::showEndLine($output_type);
347347

348348
$prev = "";
349-
for ($row_num = 2 ; $row = $DB->fetch_assoc($res); $row_num++) {
349+
for ($row_num = 2 ; $row = $DB->fetchAssoc($res); $row_num++) {
350350
$crt = "";
351351
foreach ($this->group_by as $colname) {
352352
if (isset ($row[$colname])) {

‎inc/column.class.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
2222
@package reports
2323
@authors Nelly Mahu-Lasson, Remi Collet, Alexandre Delaunay
24-
@copyright Copyright (c) 2009-2019 Reports plugin team
24+
@copyright Copyright (c) 2009-2020 Reports plugin team
2525
@license AGPL License 3.0 or (at your option) any later version
2626
http://www.gnu.org/licenses/agpl-3.0-standalone.html
2727
@link https://forge.glpi-project.org/projects/reports

‎inc/columndate.class.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
2222
@package reports
2323
@authors Nelly Mahu-Lasson, Remi Collet, Alexandre Delaunay
24-
@copyright Copyright (c) 2009-2019 Reports plugin team
24+
@copyright Copyright (c) 2009-2020 Reports plugin team
2525
@license AGPL License 3.0 or (at your option) any later version
2626
http://www.gnu.org/licenses/agpl-3.0-standalone.html
2727
@link https://forge.glpi-project.org/projects/reports

‎inc/columndatetime.class.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
2222
@package reports
2323
@authors Nelly Mahu-Lasson, Remi Collet, Alexandre Delaunay
24-
@copyright Copyright (c) 2009-2019 Reports plugin team
24+
@copyright Copyright (c) 2009-2020 Reports plugin team
2525
@license AGPL License 3.0 or (at your option) any later version
2626
http://www.gnu.org/licenses/agpl-3.0-standalone.html
2727
@link https://forge.glpi-project.org/projects/reports

‎inc/columndropdownlinkedtype.class.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
2222
@package reports
2323
@authors Nelly Mahu-Lasson, Remi Collet, Alexandre Delaunay
24-
@copyright Copyright (c) 2009-2019 Reports plugin team
24+
@copyright Copyright (c) 2009-2020 Reports plugin team
2525
@license AGPL License 3.0 or (at your option) any later version
2626
http://www.gnu.org/licenses/agpl-3.0-standalone.html
2727
@link https://forge.glpi-project.org/projects/reports

0 commit comments

Comments
 (0)