Skip to content

Commit

Permalink
create tag 1.6.1
Browse files Browse the repository at this point in the history 
git-svn-id: https://forge.glpi-project.org/svn/pdf/tags/1.6.1@550 349b9182-4a13-0410-896f-e5e9767dd1b3
  • Loading branch information
yllen committed Aug 26, 2020
1 parent 8f1f632 commit b151b8e
Show file tree
Hide file tree
Showing 65 changed files with 830 additions and 68 deletions.
2 changes: 1 addition & 1 deletion front/config.form.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2019 PDF plugin team
@copyright Copyright (c) 2019-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion front/export.massive.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion front/export.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion front/preference.form.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion hook.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/cartridge.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/cartridgeitem.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2018-2019 PDF plugin team
@copyright Copyright (c) 2018-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/change.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/change_item.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/change_problem.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/changetask.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/changevalidation.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
4 changes: 2 additions & 2 deletions inc/common.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down Expand Up @@ -411,7 +411,7 @@ static function mainTitle(PluginPdfSimplePDF $pdf, $item) {
$col1 = '<b>'.sprintf(__('%1$s %2$s'),__('ID'), $item->fields['id']).'</b>';
$col2 = sprintf(__('%1$s: %2$s'), __('Last update'),
Html::convDateTime($item->fields['date_mod']));
if (!empty($printer->fields['template_name'])) {
if (!empty($item->fields['template_name'])) {
$col2 = sprintf(__('%1$s (%2$s)'), $col2,
sprintf(__('%1$s: %2$s'), __('Template name'),
$item->fields['template_name']));
Expand Down
2 changes: 1 addition & 1 deletion inc/commonitilcost.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/computer.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/computer_item.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/computer_softwarelicense.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/computer_softwareversion.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/computerantivirus.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2018 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
7 changes: 3 additions & 4 deletions inc/computervirtualmachine.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down Expand Up @@ -93,11 +93,10 @@ static function pdfForComputer(PluginPdfSimplePDF $pdf, Computer $item) {

// From ComputerVirtualMachine::showForVirtualMachine()
if ($item->fields['uuid']) {
$where = "`uuid`".ComputerVirtualMachine::getUUIDRestrictRequest($item->fields['uuid']);
$hosts = $dbu->getAllDataFromTable(self::getTable(),
$hosts = $dbu->getAllDataFromTable($item::getTable(),
['RAW'
=> ['LOWER(uuid)'
=> self::getUUIDRestrictCriteria($comp->fields['uuid'])
=> ComputerVirtualMachine::getUUIDRestrictRequest($item->fields['uuid'])
]
]);

Expand Down
2 changes: 1 addition & 1 deletion inc/config.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2018 PDF plugin team
@copyright Copyright (c) 2018-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/consumableitem.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2018-2019 PDF plugin team
@copyright Copyright (c) 2018-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/contract_item.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/document.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/group.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/group_user.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/infocom.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/item_device.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2018-2019 PDF plugin team
@copyright Copyright (c) 2018-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/item_disk.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2019 PDF plugin team
@copyright Copyright (c) 2019-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/item_knowbaseitem.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2019 PDF plugin team
@copyright Copyright (c) 2019-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/item_operatingsystem.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2017-2019 PDF plugin team
@copyright Copyright (c) 2017-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/item_problem.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/item_ticket.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/itilfollowup.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2019 PDF plugin team
@copyright Copyright (c) 2019-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/itilsolution.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2018-2019 PDF plugin team
@copyright Copyright (c) 2018-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/knowbaseitem.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/link.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/log.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/monitor.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/networkequipment.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
2 changes: 1 addition & 1 deletion inc/networkport.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@package pdf
@authors Nelly Mahu-Lasson, Remi Collet
@copyright Copyright (c) 2009-2019 PDF plugin team
@copyright Copyright (c) 2009-2020 PDF plugin team
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link https://forge.glpi-project.org/projects/pdf
Expand Down
Loading

0 comments on commit b151b8e

Please sign in to comment.