From d118a66e4c8d34995907a713d1f31c99d7a4b64a Mon Sep 17 00:00:00 2001
From: Philippe Audeoud <jadawin@FreeBSD.org>
Date: Tue, 11 Sep 2012 12:05:13 +0000
Subject: [PATCH] - Update to 0.83.4

PR:		ports/170818
Submitted by:	Mathias Monnerville <mathias _AT_ monnerville.com>
---
 www/glpi/Makefile  |   2 +-
 www/glpi/distinfo  |   4 +-
 www/glpi/pkg-plist | 318 ++++++++++++++++++++-------------------------
 3 files changed, 143 insertions(+), 181 deletions(-)

diff --git a/www/glpi/Makefile b/www/glpi/Makefile
index c5167f2d9b5a..ae4e7bb8bd8f 100644
--- a/www/glpi/Makefile
+++ b/www/glpi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	glpi
-PORTVERSION=	0.80.7
+PORTVERSION=	0.83.4
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://droidng.free.fr/freebsd/ \
diff --git a/www/glpi/distinfo b/www/glpi/distinfo
index 357ecdbf53a4..40ae5f5f95e8 100644
--- a/www/glpi/distinfo
+++ b/www/glpi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (glpi-0.80.7.tar.gz) = 06567fcb312b1674c4538640ab01702c4db4a460b5c955337c77c6e7159ee813
-SIZE (glpi-0.80.7.tar.gz) = 4111598
+SHA256 (glpi-0.83.4.tar.gz) = 60c71607be6b7aae9c0c0b3772ec4226e93fffed249b2f07c1a1c6c6afc9bc96
+SIZE (glpi-0.83.4.tar.gz) = 4427691
diff --git a/www/glpi/pkg-plist b/www/glpi/pkg-plist
index 0c0f5c2b3cff..0e4cdf138161 100644
--- a/www/glpi/pkg-plist
+++ b/www/glpi/pkg-plist
@@ -2,58 +2,18 @@ www/glpi/CHANGELOG.txt
 www/glpi/COPYING.txt
 www/glpi/LISEZMOI.txt
 www/glpi/README.txt
-www/glpi/ajax/authldap.tabs.php
-www/glpi/ajax/authmail.tabs.php
 www/glpi/ajax/autocompletion.php
-www/glpi/ajax/autoupdatesystem.tabs.php
-www/glpi/ajax/bookmark.tabs.php
-www/glpi/ajax/budget.tabs.php
-www/glpi/ajax/calendar.tabs.php
-www/glpi/ajax/cartridgeitem.tabs.php
-www/glpi/ajax/cartridgeitemtype.tabs.php
-www/glpi/ajax/central.tabs.php
 www/glpi/ajax/comments.php
-www/glpi/ajax/computer.tabs.php
-www/glpi/ajax/computerdisk.tabs.php
-www/glpi/ajax/computermodel.tabs.php
-www/glpi/ajax/computertype.tabs.php
-www/glpi/ajax/computervirtualmachine.tabs.php
-www/glpi/ajax/config.tabs.php
-www/glpi/ajax/consumableitem.tabs.php
-www/glpi/ajax/consumableitemtype.tabs.php
-www/glpi/ajax/contact.tabs.php
-www/glpi/ajax/contacttype.tabs.php
-www/glpi/ajax/contract.tabs.php
-www/glpi/ajax/contracttype.tabs.php
-www/glpi/ajax/crontask.tabs.php
-www/glpi/ajax/device.tabs.php
-www/glpi/ajax/devicecase.tabs.php
-www/glpi/ajax/devicecasetype.tabs.php
-www/glpi/ajax/devicecontrol.tabs.php
-www/glpi/ajax/devicedrive.tabs.php
-www/glpi/ajax/devicegraphiccard.tabs.php
-www/glpi/ajax/deviceharddrive.tabs.php
-www/glpi/ajax/devicememory.tabs.php
-www/glpi/ajax/devicememorytype.tabs.php
-www/glpi/ajax/devicemotherboard.tabs.php
-www/glpi/ajax/devicenetworkcard.tabs.php
-www/glpi/ajax/devicepci.tabs.php
-www/glpi/ajax/devicepowersupply.tabs.php
-www/glpi/ajax/deviceprocessor.tabs.php
-www/glpi/ajax/devicesoundcard.tabs.php
-www/glpi/ajax/displaypreference.tabs.php
-www/glpi/ajax/document.tabs.php
-www/glpi/ajax/documentcategory.tabs.php
-www/glpi/ajax/documenttype.tabs.php
-www/glpi/ajax/domain.tabs.php
-www/glpi/ajax/dropdown.common.tabs.php
+www/glpi/ajax/common.tabs.php
 www/glpi/ajax/dropdownAllItems.php
 www/glpi/ajax/dropdownConnect.php
 www/glpi/ajax/dropdownConnectPort.php
 www/glpi/ajax/dropdownConnectPortDeviceType.php
+www/glpi/ajax/dropdownDelegationUsers.php
 www/glpi/ajax/dropdownFieldsBlacklist.php
 www/glpi/ajax/dropdownFindNum.php
 www/glpi/ajax/dropdownInstallVersion.php
+www/glpi/ajax/dropdownItilActors.php
 www/glpi/ajax/dropdownMassiveAction.php
 www/glpi/ajax/dropdownMassiveActionAddActor.php
 www/glpi/ajax/dropdownMassiveActionAuthMethods.php
@@ -67,134 +27,42 @@ www/glpi/ajax/dropdownRules.php
 www/glpi/ajax/dropdownSelectSoftware.php
 www/glpi/ajax/dropdownSelectSoftwareLicense.php
 www/glpi/ajax/dropdownSoftwareLicense.php
-www/glpi/ajax/dropdownTicketActors.php
+www/glpi/ajax/dropdownTicketCategories.php
 www/glpi/ajax/dropdownTrackingDeviceType.php
 www/glpi/ajax/dropdownUnicityFields.php
 www/glpi/ajax/dropdownUsers.php
-www/glpi/ajax/dropdownUsersTracking.php
 www/glpi/ajax/dropdownValue.php
 www/glpi/ajax/dropdownValuesBlacklist.php
-www/glpi/ajax/entity.tabs.php
 www/glpi/ajax/entitytree.php
 www/glpi/ajax/entitytreesons.php
-www/glpi/ajax/fieldblacklist.tabs.php
-www/glpi/ajax/fieldunicity.tabs.php
-www/glpi/ajax/filesystem.tabs.php
 www/glpi/ajax/genericdate.php
-www/glpi/ajax/group.tabs.php
-www/glpi/ajax/holiday.tabs.php
 www/glpi/ajax/index.php
 www/glpi/ajax/inputtext.php
-www/glpi/ajax/interfacetype.tabs.php
-www/glpi/ajax/knowbaseitem.tabs.php
-www/glpi/ajax/knowbaseitemcategory.tabs.php
 www/glpi/ajax/ldapdaterestriction.php
-www/glpi/ajax/link.tabs.php
-www/glpi/ajax/location.tabs.php
-www/glpi/ajax/mailcollector.tabs.php
-www/glpi/ajax/manufacturer.tabs.php
-www/glpi/ajax/monitor.tabs.php
-www/glpi/ajax/monitormodel.tabs.php
-www/glpi/ajax/monitortype.tabs.php
-www/glpi/ajax/netpoint.tabs.php
-www/glpi/ajax/network.tabs.php
-www/glpi/ajax/networkequipment.tabs.php
-www/glpi/ajax/networkequipmentfirmware.tabs.php
-www/glpi/ajax/networkequipmentmodel.tabs.php
-www/glpi/ajax/networkequipmenttype.tabs.php
-www/glpi/ajax/networkinterface.tabs.php
-www/glpi/ajax/networkport.tabs.php
-www/glpi/ajax/notification.tabs.php
-www/glpi/ajax/notificationmailsetting.tabs.php
-www/glpi/ajax/notificationtemplate.tabs.php
-www/glpi/ajax/notificationtemplatetranslation.tabs.php
-www/glpi/ajax/ocsserver.tabs.php
-www/glpi/ajax/operatingsystem.tabs.php
-www/glpi/ajax/operatingsystemservicepack.tabs.php
-www/glpi/ajax/operatingsystemversion.tabs.php
-www/glpi/ajax/peripheral.tabs.php
-www/glpi/ajax/peripheralmodel.tabs.php
-www/glpi/ajax/peripheraltype.tabs.php
-www/glpi/ajax/phone.tabs.php
-www/glpi/ajax/phonemodel.tabs.php
-www/glpi/ajax/phonepowersupply.tabs.php
-www/glpi/ajax/phonetype.tabs.php
 www/glpi/ajax/planning.php
+www/glpi/ajax/planningcheck.php
 www/glpi/ajax/planningend.php
-www/glpi/ajax/preference.tabs.php
-www/glpi/ajax/printer.tabs.php
-www/glpi/ajax/printermodel.tabs.php
-www/glpi/ajax/printertype.tabs.php
 www/glpi/ajax/priority.php
 www/glpi/ajax/private_public.php
-www/glpi/ajax/profile.tabs.php
-www/glpi/ajax/requesttype.tabs.php
-www/glpi/ajax/rule.common.tabs.php
 www/glpi/ajax/ruleaction.php
 www/glpi/ajax/ruleactionvalue.php
 www/glpi/ajax/rulecriteria.php
 www/glpi/ajax/rulecriteriavalue.php
-www/glpi/ajax/ruledictionnarycomputermodel.tabs.php
-www/glpi/ajax/ruledictionnarycomputertype.tabs.php
-www/glpi/ajax/ruledictionnarymanufacturer.tabs.php
-www/glpi/ajax/ruledictionnarymonitormodel.tabs.php
-www/glpi/ajax/ruledictionnarymonitortype.tabs.php
-www/glpi/ajax/ruledictionnarynetworkequipmentmodel.tabs.php
-www/glpi/ajax/ruledictionnarynetworkequipmenttype.tabs.php
-www/glpi/ajax/ruledictionnaryoperatingsystem.tabs.php
-www/glpi/ajax/ruledictionnaryoperatingsystemservicepack.tabs.php
-www/glpi/ajax/ruledictionnaryoperatingsystemversion.tabs.php
-www/glpi/ajax/ruledictionnaryperipheralmodel.tabs.php
-www/glpi/ajax/ruledictionnaryperipheraltype.tabs.php
-www/glpi/ajax/ruledictionnaryphonemodel.tabs.php
-www/glpi/ajax/ruledictionnaryphonetype.tabs.php
-www/glpi/ajax/ruledictionnaryprinter.tabs.php
-www/glpi/ajax/ruledictionnaryprintermodel.tabs.php
-www/glpi/ajax/ruledictionnaryprintertype.tabs.php
-www/glpi/ajax/ruledictionnarysoftware.tabs.php
-www/glpi/ajax/ruleimportcomputer.tabs.php
-www/glpi/ajax/rulemailcollector.tabs.php
-www/glpi/ajax/ruleocs.tabs.php
-www/glpi/ajax/ruleright.tabs.php
-www/glpi/ajax/rulerightparameter.tabs.php
-www/glpi/ajax/rules.tabs.php
-www/glpi/ajax/rulesoftwarecategory.tabs.php
-www/glpi/ajax/ruleticket.tabs.php
 www/glpi/ajax/searchoption.php
 www/glpi/ajax/searchoptionvalue.php
-www/glpi/ajax/sla.tabs.php
-www/glpi/ajax/slalevel.tabs.php
-www/glpi/ajax/software.tabs.php
-www/glpi/ajax/softwarecategory.tabs.php
-www/glpi/ajax/softwarelicense.tabs.php
-www/glpi/ajax/softwarelicensetype.tabs.php
-www/glpi/ajax/softwareversion.tabs.php
 www/glpi/ajax/solution.php
-www/glpi/ajax/state.tabs.php
-www/glpi/ajax/supplier.tabs.php
-www/glpi/ajax/suppliertype.tabs.php
-www/glpi/ajax/taskcategory.tabs.php
+www/glpi/ajax/subvisibility.php
 www/glpi/ajax/textarea.php
-www/glpi/ajax/ticket.tabs.php
-www/glpi/ajax/ticketcategory.tabs.php
+www/glpi/ajax/ticketassigninformation.php
+www/glpi/ajax/ticketiteminformation.php
 www/glpi/ajax/ticketsatisfaction.php
-www/glpi/ajax/ticketsolutiontemplate.tabs.php
-www/glpi/ajax/ticketsolutiontype.tabs.php
-www/glpi/ajax/ticketvalidation.tabs.php
-www/glpi/ajax/transfer.tabs.php
 www/glpi/ajax/transfers.php
 www/glpi/ajax/uemailUpdate.php
 www/glpi/ajax/updateMetaSearch.php
 www/glpi/ajax/updateTrackingDeviceType.php
 www/glpi/ajax/updatecurrenttab.php
-www/glpi/ajax/user.tabs.php
-www/glpi/ajax/usercategory.tabs.php
-www/glpi/ajax/usertitle.tabs.php
-www/glpi/ajax/viewfollowup.php
-www/glpi/ajax/virtualmachinestate.tabs.php
-www/glpi/ajax/virtualmachinesystem.tabs.php
-www/glpi/ajax/virtualmachinetype.tabs.php
-www/glpi/ajax/vlan.tabs.php
+www/glpi/ajax/viewsubitem.php
+www/glpi/ajax/visibility.php
 www/glpi/config/.htaccess
 www/glpi/config/based_config.php
 www/glpi/config/config.php
@@ -205,6 +73,7 @@ www/glpi/css/print.css
 www/glpi/css/style_install.css
 www/glpi/css/styles.css
 www/glpi/css/styles_ie.css
+www/glpi/css/tab-scroller-menu.css
 www/glpi/css/win_png.htc
 www/glpi/files/.htaccess
 www/glpi/files/_cache/remove.txt
@@ -239,6 +108,13 @@ www/glpi/front/cartridgeitem.php
 www/glpi/front/cartridgeitemtype.form.php
 www/glpi/front/cartridgeitemtype.php
 www/glpi/front/central.php
+www/glpi/front/change.form.php
+www/glpi/front/change.php
+www/glpi/front/change_item.form.php
+www/glpi/front/change_problem.form.php
+www/glpi/front/change_ticket.form.php
+www/glpi/front/changetask.form.php
+www/glpi/front/commonitiltask.form.php
 www/glpi/front/computer.form.php
 www/glpi/front/computer.php
 www/glpi/front/computer_device.form.php
@@ -329,6 +205,7 @@ www/glpi/front/group.form.php
 www/glpi/front/group.php
 www/glpi/front/helpdesk.faq.php
 www/glpi/front/helpdesk.html
+www/glpi/front/helpdesk.php
 www/glpi/front/helpdesk.public.php
 www/glpi/front/holiday.form.php
 www/glpi/front/holiday.php
@@ -336,6 +213,9 @@ www/glpi/front/index.php
 www/glpi/front/infocom.form.php
 www/glpi/front/interfacetype.form.php
 www/glpi/front/interfacetype.php
+www/glpi/front/item_problem.form.php
+www/glpi/front/itilcategory.form.php
+www/glpi/front/itilcategory.php
 www/glpi/front/knowbaseitem.form.php
 www/glpi/front/knowbaseitem.php
 www/glpi/front/knowbaseitemcategory.form.php
@@ -386,6 +266,7 @@ www/glpi/front/notificationtemplate.form.php
 www/glpi/front/notificationtemplate.php
 www/glpi/front/notificationtemplatetranslation.form.php
 www/glpi/front/notimportedemail.php
+www/glpi/front/ocslink.form.php
 www/glpi/front/ocsng.clean.php
 www/glpi/front/ocsng.import.php
 www/glpi/front/ocsng.link.php
@@ -424,6 +305,10 @@ www/glpi/front/printermodel.form.php
 www/glpi/front/printermodel.php
 www/glpi/front/printertype.form.php
 www/glpi/front/printertype.php
+www/glpi/front/problem.form.php
+www/glpi/front/problem.php
+www/glpi/front/problem_ticket.form.php
+www/glpi/front/problemtask.form.php
 www/glpi/front/profile.form.php
 www/glpi/front/profile.php
 www/glpi/front/profile_user.form.php
@@ -521,6 +406,10 @@ www/glpi/front/softwarelicense.form.php
 www/glpi/front/softwarelicensetype.form.php
 www/glpi/front/softwarelicensetype.php
 www/glpi/front/softwareversion.form.php
+www/glpi/front/solutiontemplate.form.php
+www/glpi/front/solutiontemplate.php
+www/glpi/front/solutiontype.form.php
+www/glpi/front/solutiontype.php
 www/glpi/front/stat.global.php
 www/glpi/front/stat.graph.php
 www/glpi/front/stat.item.php
@@ -539,15 +428,16 @@ www/glpi/front/taskcategory.php
 www/glpi/front/ticket.form.php
 www/glpi/front/ticket.php
 www/glpi/front/ticket_user.form.php
-www/glpi/front/ticketcategory.form.php
-www/glpi/front/ticketcategory.php
 www/glpi/front/ticketfollowup.form.php
+www/glpi/front/ticketrecurrent.form.php
+www/glpi/front/ticketrecurrent.php
 www/glpi/front/ticketsatisfaction.form.php
-www/glpi/front/ticketsolutiontemplate.form.php
-www/glpi/front/ticketsolutiontemplate.php
-www/glpi/front/ticketsolutiontype.form.php
-www/glpi/front/ticketsolutiontype.php
 www/glpi/front/tickettask.form.php
+www/glpi/front/tickettemplate.form.php
+www/glpi/front/tickettemplate.php
+www/glpi/front/tickettemplatehiddenfield.form.php
+www/glpi/front/tickettemplatemandatoryfield.form.php
+www/glpi/front/tickettemplatepredefinedfield.form.php
 www/glpi/front/ticketvalidation.form.php
 www/glpi/front/tracking.injector.php
 www/glpi/front/transfer.action.php
@@ -567,13 +457,13 @@ www/glpi/front/virtualmachinetype.form.php
 www/glpi/front/virtualmachinetype.php
 www/glpi/front/vlan.form.php
 www/glpi/front/vlan.php
-www/glpi/inc/ajax.function.php
+www/glpi/inc/ajax.class.php
 www/glpi/inc/alert.class.php
 www/glpi/inc/auth.class.php
-www/glpi/inc/auth.function.php
 www/glpi/inc/authldap.class.php
 www/glpi/inc/authldapreplicate.class.php
 www/glpi/inc/authmail.class.php
+www/glpi/inc/autoload.function.php
 www/glpi/inc/autoupdatesystem.class.php
 www/glpi/inc/bookmark.class.php
 www/glpi/inc/bookmark_user.class.php
@@ -585,13 +475,22 @@ www/glpi/inc/cartridge.class.php
 www/glpi/inc/cartridgeitem.class.php
 www/glpi/inc/cartridgeitemtype.class.php
 www/glpi/inc/central.class.php
-www/glpi/inc/common.function.php
+www/glpi/inc/change.class.php
+www/glpi/inc/change_group.class.php
+www/glpi/inc/change_item.class.php
+www/glpi/inc/change_problem.class.php
+www/glpi/inc/change_ticket.class.php
+www/glpi/inc/change_user.class.php
+www/glpi/inc/changetask.class.php
 www/glpi/inc/commondbchild.class.php
 www/glpi/inc/commondbrelation.class.php
 www/glpi/inc/commondbtm.class.php
 www/glpi/inc/commondevice.class.php
 www/glpi/inc/commondropdown.class.php
 www/glpi/inc/commonglpi.class.php
+www/glpi/inc/commonitilactor.class.php
+www/glpi/inc/commonitilobject.class.php
+www/glpi/inc/commonitiltask.class.php
 www/glpi/inc/commontreedropdown.class.php
 www/glpi/inc/computer.class.php
 www/glpi/inc/computer_device.class.php
@@ -632,7 +531,6 @@ www/glpi/inc/devicepci.class.php
 www/glpi/inc/devicepowersupply.class.php
 www/glpi/inc/deviceprocessor.class.php
 www/glpi/inc/devicesoundcard.class.php
-www/glpi/inc/display.function.php
 www/glpi/inc/displaypreference.class.php
 www/glpi/inc/document.class.php
 www/glpi/inc/document_item.class.php
@@ -641,6 +539,8 @@ www/glpi/inc/documenttype.class.php
 www/glpi/inc/domain.class.php
 www/glpi/inc/dropdown.class.php
 www/glpi/inc/entity.class.php
+www/glpi/inc/entity_knowbaseitem.class.php
+www/glpi/inc/entity_reminder.class.php
 www/glpi/inc/entitydata.class.php
 www/glpi/inc/event.class.php
 www/glpi/inc/fieldblacklist.class.php
@@ -648,14 +548,22 @@ www/glpi/inc/fieldunicity.class.php
 www/glpi/inc/filesystem.class.php
 www/glpi/inc/graphpalette.class.php
 www/glpi/inc/group.class.php
+www/glpi/inc/group_knowbaseitem.class.php
+www/glpi/inc/group_problem.class.php
+www/glpi/inc/group_reminder.class.php
 www/glpi/inc/group_ticket.class.php
 www/glpi/inc/group_user.class.php
 www/glpi/inc/holiday.class.php
+www/glpi/inc/html.class.php
 www/glpi/inc/includes.php
 www/glpi/inc/index.php
 www/glpi/inc/infocom.class.php
 www/glpi/inc/interfacetype.class.php
+www/glpi/inc/item_problem.class.php
+www/glpi/inc/itilcategory.class.php
 www/glpi/inc/knowbaseitem.class.php
+www/glpi/inc/knowbaseitem_profile.class.php
+www/glpi/inc/knowbaseitem_user.class.php
 www/glpi/inc/knowbaseitemcategory.class.php
 www/glpi/inc/link.class.php
 www/glpi/inc/link_itemtype.class.php
@@ -684,12 +592,14 @@ www/glpi/inc/notificationmail.class.php
 www/glpi/inc/notificationmailsetting.class.php
 www/glpi/inc/notificationtarget.class.php
 www/glpi/inc/notificationtargetcartridge.class.php
+www/glpi/inc/notificationtargetcommonitilobject.class.php
 www/glpi/inc/notificationtargetconsumable.class.php
 www/glpi/inc/notificationtargetcontract.class.php
 www/glpi/inc/notificationtargetcrontask.class.php
 www/glpi/inc/notificationtargetdbconnection.class.php
 www/glpi/inc/notificationtargetfieldunicity.class.php
 www/glpi/inc/notificationtargetinfocom.class.php
+www/glpi/inc/notificationtargetproblem.class.php
 www/glpi/inc/notificationtargetreservation.class.php
 www/glpi/inc/notificationtargetsoftwarelicense.class.php
 www/glpi/inc/notificationtargetticket.class.php
@@ -712,16 +622,22 @@ www/glpi/inc/phonepowersupply.class.php
 www/glpi/inc/phonetype.class.php
 www/glpi/inc/planning.class.php
 www/glpi/inc/plugin.class.php
-www/glpi/inc/plugin.function.php
 www/glpi/inc/preference.class.php
 www/glpi/inc/printer.class.php
 www/glpi/inc/printermodel.class.php
 www/glpi/inc/printertype.class.php
+www/glpi/inc/problem.class.php
+www/glpi/inc/problem_ticket.class.php
+www/glpi/inc/problem_user.class.php
+www/glpi/inc/problemtask.class.php
 www/glpi/inc/profile.class.php
+www/glpi/inc/profile_reminder.class.php
 www/glpi/inc/profile_user.class.php
 www/glpi/inc/registrykey.class.php
 www/glpi/inc/relation.constant.php
 www/glpi/inc/reminder.class.php
+www/glpi/inc/reminder_user.class.php
+www/glpi/inc/report.class.php
 www/glpi/inc/requesttype.class.php
 www/glpi/inc/reservation.class.php
 www/glpi/inc/reservationitem.class.php
@@ -783,7 +699,7 @@ www/glpi/inc/rulesoftwarecategorycollection.class.php
 www/glpi/inc/ruleticket.class.php
 www/glpi/inc/ruleticketcollection.class.php
 www/glpi/inc/search.class.php
-www/glpi/inc/setup.function.php
+www/glpi/inc/session.class.php
 www/glpi/inc/singletonrulelist.class.php
 www/glpi/inc/sla.class.php
 www/glpi/inc/slalevel.class.php
@@ -794,6 +710,8 @@ www/glpi/inc/softwarecategory.class.php
 www/glpi/inc/softwarelicense.class.php
 www/glpi/inc/softwarelicensetype.class.php
 www/glpi/inc/softwareversion.class.php
+www/glpi/inc/solutiontemplate.class.php
+www/glpi/inc/solutiontype.class.php
 www/glpi/inc/stat.class.php
 www/glpi/inc/state.class.php
 www/glpi/inc/supplier.class.php
@@ -802,18 +720,21 @@ www/glpi/inc/taskcategory.class.php
 www/glpi/inc/ticket.class.php
 www/glpi/inc/ticket_ticket.class.php
 www/glpi/inc/ticket_user.class.php
-www/glpi/inc/ticketcategory.class.php
 www/glpi/inc/ticketfollowup.class.php
-www/glpi/inc/ticketplanning.class.php
+www/glpi/inc/ticketrecurrent.class.php
 www/glpi/inc/ticketsatisfaction.class.php
-www/glpi/inc/ticketsolutiontemplate.class.php
-www/glpi/inc/ticketsolutiontype.class.php
 www/glpi/inc/tickettask.class.php
+www/glpi/inc/tickettemplate.class.php
+www/glpi/inc/tickettemplatehiddenfield.class.php
+www/glpi/inc/tickettemplatemandatoryfield.class.php
+www/glpi/inc/tickettemplatepredefinedfield.class.php
 www/glpi/inc/ticketvalidation.class.php
 www/glpi/inc/timer.class.php
+www/glpi/inc/toolbox.class.php
 www/glpi/inc/transfer.class.php
 www/glpi/inc/user.class.php
 www/glpi/inc/usercategory.class.php
+www/glpi/inc/useremail.class.php
 www/glpi/inc/usertitle.class.php
 www/glpi/inc/virtualmachinestate.class.php
 www/glpi/inc/virtualmachinesystem.class.php
@@ -824,7 +745,7 @@ www/glpi/index.php
 www/glpi/install/index.php
 www/glpi/install/install.php
 www/glpi/install/mysql/.htaccess
-www/glpi/install/mysql/glpi-0.80.3-empty.sql
+www/glpi/install/mysql/glpi-0.83.1-empty.sql
 www/glpi/install/update.php
 www/glpi/install/update_031_04.php
 www/glpi/install/update_042_05.php
@@ -847,7 +768,10 @@ www/glpi/install/update_0782_080.php
 www/glpi/install/update_078_0781.php
 www/glpi/install/update_07_071.php
 www/glpi/install/update_0801_0803.php
+www/glpi/install/update_0803_083.php
 www/glpi/install/update_080_0801.php
+www/glpi/install/update_0831_0833.php
+www/glpi/install/update_083_0831.php
 www/glpi/install/update_content.php
 www/glpi/install/update_to_031.php
 www/glpi/lib/cache_lite/LICENSE
@@ -1249,6 +1173,7 @@ www/glpi/lib/extjs/resources/images/default/window/right-corners.psd
 www/glpi/lib/extjs/resources/images/default/window/top-bottom.png
 www/glpi/lib/extjs/resources/images/default/window/top-bottom.psd
 www/glpi/lib/extjs/s.gif
+www/glpi/lib/extrajs/TabScrollerMenu.js
 www/glpi/lib/extrajs/datetime.js
 www/glpi/lib/extrajs/spancombobox.js
 www/glpi/lib/extrajs/starslider/images/slider-bg.jpg
@@ -1423,28 +1348,55 @@ www/glpi/lib/ezpdf/class.ezpdf.php
 www/glpi/lib/ezpdf/class.pdf.php
 www/glpi/lib/ezpdf/fonts/Helvetica.afm
 www/glpi/lib/ezpdf/fonts/php_Helvetica.afm
+www/glpi/lib/htmlawed/htmLawed.php
 www/glpi/lib/icalcreator/iCalUtilityFunctions.class.php
 www/glpi/lib/icalcreator/iCalcreator.class.php
 www/glpi/lib/icalcreator/lgpl.txt
 www/glpi/lib/index.php
 www/glpi/lib/phpcas/CAS.php
+www/glpi/lib/phpcas/CAS/AuthenticationException.php
+www/glpi/lib/phpcas/CAS/Autoload.php
+www/glpi/lib/phpcas/CAS/Client.php
 www/glpi/lib/phpcas/CAS/CookieJar.php
-www/glpi/lib/phpcas/CAS/PGTStorage/pgt-file.php
-www/glpi/lib/phpcas/CAS/PGTStorage/pgt-main.php
+www/glpi/lib/phpcas/CAS/Exception.php
+www/glpi/lib/phpcas/CAS/GracefullTerminationException.php
+www/glpi/lib/phpcas/CAS/InvalidArgumentException.php
+www/glpi/lib/phpcas/CAS/Languages/Catalan.php
+www/glpi/lib/phpcas/CAS/Languages/English.php
+www/glpi/lib/phpcas/CAS/Languages/French.php
+www/glpi/lib/phpcas/CAS/Languages/German.php
+www/glpi/lib/phpcas/CAS/Languages/Greek.php
+www/glpi/lib/phpcas/CAS/Languages/Japanese.php
+www/glpi/lib/phpcas/CAS/Languages/LanguageInterface.php
+www/glpi/lib/phpcas/CAS/Languages/Spanish.php
+www/glpi/lib/phpcas/CAS/OutOfSequenceException.php
+www/glpi/lib/phpcas/CAS/PGTStorage/AbstractStorage.php
+www/glpi/lib/phpcas/CAS/PGTStorage/Db.php
+www/glpi/lib/phpcas/CAS/PGTStorage/File.php
+www/glpi/lib/phpcas/CAS/ProxiedService.php
+www/glpi/lib/phpcas/CAS/ProxiedService/Abstract.php
+www/glpi/lib/phpcas/CAS/ProxiedService/Exception.php
+www/glpi/lib/phpcas/CAS/ProxiedService/Http.php
+www/glpi/lib/phpcas/CAS/ProxiedService/Http/Abstract.php
+www/glpi/lib/phpcas/CAS/ProxiedService/Http/Get.php
+www/glpi/lib/phpcas/CAS/ProxiedService/Http/Post.php
+www/glpi/lib/phpcas/CAS/ProxiedService/Imap.php
+www/glpi/lib/phpcas/CAS/ProxiedService/Testable.php
+www/glpi/lib/phpcas/CAS/ProxyChain.php
+www/glpi/lib/phpcas/CAS/ProxyChain/AllowedList.php
+www/glpi/lib/phpcas/CAS/ProxyChain/Any.php
+www/glpi/lib/phpcas/CAS/ProxyChain/Interface.php
+www/glpi/lib/phpcas/CAS/ProxyChain/Trusted.php
+www/glpi/lib/phpcas/CAS/ProxyTicketException.php
 www/glpi/lib/phpcas/CAS/Request/AbstractRequest.php
+www/glpi/lib/phpcas/CAS/Request/CurlMultiRequest.php
 www/glpi/lib/phpcas/CAS/Request/CurlRequest.php
+www/glpi/lib/phpcas/CAS/Request/Exception.php
+www/glpi/lib/phpcas/CAS/Request/MultiRequestInterface.php
 www/glpi/lib/phpcas/CAS/Request/RequestInterface.php
-www/glpi/lib/phpcas/CAS/client.php
-www/glpi/lib/phpcas/CAS/languages/catalan.php
-www/glpi/lib/phpcas/CAS/languages/english.php
-www/glpi/lib/phpcas/CAS/languages/french.php
-www/glpi/lib/phpcas/CAS/languages/german.php
-www/glpi/lib/phpcas/CAS/languages/greek.php
-www/glpi/lib/phpcas/CAS/languages/japanese.php
-www/glpi/lib/phpcas/CAS/languages/languages.php
-www/glpi/lib/phpcas/CAS/languages/spanish.php
-www/glpi/lib/phpcas/ChangeLog
-www/glpi/lib/phpcas/README
+www/glpi/lib/phpcas/LICENSE
+www/glpi/lib/phpcas/NOTICE
+www/glpi/lib/phpcas/README.md
 www/glpi/lib/phpmailer/ChangeLog.txt
 www/glpi/lib/phpmailer/LICENSE
 www/glpi/lib/phpmailer/README
@@ -1985,7 +1937,9 @@ www/glpi/locales/dk_DK.php
 www/glpi/locales/ee_ET.php
 www/glpi/locales/el_EL.php
 www/glpi/locales/en_GB.php
+www/glpi/locales/en_US.php
 www/glpi/locales/es_AR.php
+www/glpi/locales/es_CO.php
 www/glpi/locales/es_ES.php
 www/glpi/locales/es_MX.php
 www/glpi/locales/es_VE.php
@@ -2018,6 +1972,7 @@ www/glpi/locales/zh_TW.php
 www/glpi/login.php
 www/glpi/logout.php
 www/glpi/pics/PICS-AUTHORS.txt
+www/glpi/pics/accepted.png
 www/glpi/pics/actualiser.png
 www/glpi/pics/add.png
 www/glpi/pics/add_dropdown.png
@@ -2033,7 +1988,6 @@ www/glpi/pics/closed.png
 www/glpi/pics/collapse.gif
 www/glpi/pics/corners.gif
 www/glpi/pics/delete.png
-www/glpi/pics/delete2.png
 www/glpi/pics/deplier_down.png
 www/glpi/pics/deplier_up.png
 www/glpi/pics/dollar.png
@@ -2077,6 +2031,7 @@ www/glpi/pics/extjs/window/left-corners.pspimage
 www/glpi/pics/extjs/window/left-right.png
 www/glpi/pics/extjs/window/right-corners.png
 www/glpi/pics/extjs/window/top-bottom.png
+www/glpi/pics/extrajs/tab-scroller-menu.gif
 www/glpi/pics/faqadd.png
 www/glpi/pics/faqdelete.png
 www/glpi/pics/faqedit.png
@@ -2094,7 +2049,6 @@ www/glpi/pics/first_off.png
 www/glpi/pics/folder-open.png
 www/glpi/pics/folder.png
 www/glpi/pics/fond-central.png
-www/glpi/pics/fond-stats.gif
 www/glpi/pics/fond.png
 www/glpi/pics/fond_form.png
 www/glpi/pics/fond_form_on.png
@@ -2102,8 +2056,6 @@ www/glpi/pics/fond_ico_cons.png
 www/glpi/pics/fond_ico_cons_on.png
 www/glpi/pics/fond_onglet.png
 www/glpi/pics/fond_th.png
-www/glpi/pics/fondgraph1.png
-www/glpi/pics/fondgraph2.png
 www/glpi/pics/greenbutton.png
 www/glpi/pics/groupes.png
 www/glpi/pics/haut_install.png
@@ -2114,6 +2066,7 @@ www/glpi/pics/icones/avi-dist.png
 www/glpi/pics/icones/bmp-dist.png
 www/glpi/pics/icones/bz2-dist.png
 www/glpi/pics/icones/c-dist.png
+www/glpi/pics/icones/csv-dist.png
 www/glpi/pics/icones/deb-dist.png
 www/glpi/pics/icones/defaut-dist.png
 www/glpi/pics/icones/doc-dist.png
@@ -2157,6 +2110,8 @@ www/glpi/pics/icones/rtf-dist.png
 www/glpi/pics/icones/sdd-dist.png
 www/glpi/pics/icones/sdw-dist.png
 www/glpi/pics/icones/sit-dist.png
+www/glpi/pics/icones/svg-dist.png
+www/glpi/pics/icones/swf-dist.png
 www/glpi/pics/icones/sxc-dist.png
 www/glpi/pics/icones/sxd-dist.png
 www/glpi/pics/icones/sxi-dist.png
@@ -2199,9 +2154,11 @@ www/glpi/pics/moins.png
 www/glpi/pics/moyenne.png
 www/glpi/pics/new.png
 www/glpi/pics/noir.png
+www/glpi/pics/observe.png
 www/glpi/pics/ok.png
 www/glpi/pics/ok2.png
 www/glpi/pics/options_search.png
+www/glpi/pics/orangebutton.png
 www/glpi/pics/pdf.png
 www/glpi/pics/periph.png
 www/glpi/pics/plan.png
@@ -2230,7 +2187,7 @@ www/glpi/pics/rightsearch.png
 www/glpi/pics/sauvegardes.png
 www/glpi/pics/showdeleted.png
 www/glpi/pics/showdeleted_no.png
-www/glpi/pics/slk.png
+www/glpi/pics/showselect.png
 www/glpi/pics/solved.png
 www/glpi/pics/stats_item.png
 www/glpi/pics/supplier.png
@@ -2253,6 +2210,7 @@ www/glpi/status.php
 @dirrm www/glpi/scripts
 @dirrm www/glpi/plugins
 @dirrm www/glpi/pics/icones
+@dirrm www/glpi/pics/extrajs
 @dirrm www/glpi/pics/extjs/window
 @dirrm www/glpi/pics/extjs/tabs
 @dirrm www/glpi/pics/extjs/qtip
@@ -2294,12 +2252,16 @@ www/glpi/status.php
 @dirrm www/glpi/lib/tiny_mce
 @dirrm www/glpi/lib/phpmailer/language
 @dirrm www/glpi/lib/phpmailer
-@dirrm www/glpi/lib/phpcas/CAS/languages
 @dirrm www/glpi/lib/phpcas/CAS/Request
+@dirrm www/glpi/lib/phpcas/CAS/ProxyChain
+@dirrm www/glpi/lib/phpcas/CAS/ProxiedService/Http
+@dirrm www/glpi/lib/phpcas/CAS/ProxiedService
 @dirrm www/glpi/lib/phpcas/CAS/PGTStorage
+@dirrm www/glpi/lib/phpcas/CAS/Languages
 @dirrm www/glpi/lib/phpcas/CAS
 @dirrm www/glpi/lib/phpcas
 @dirrm www/glpi/lib/icalcreator
+@dirrm www/glpi/lib/htmlawed
 @dirrm www/glpi/lib/ezpdf/fonts
 @dirrm www/glpi/lib/ezpdf
 @dirrm www/glpi/lib/ezcomponents/autoload