3 files changed, 321 insertions, 79 deletions

diff --git a/www/glpi/Makefile b/www/glpi/Makefile
index 8a5f4cddb98d..71ac4d4893e2 100644
--- a/www/glpi/Makefile
+++ b/www/glpi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	glpi
-DISTVERSION=	0.68.3-2
+DISTVERSION=	0.70
 CATEGORIES=	www
 MASTER_SITES=	http://glpi-project.org/IMG/gz/ \
 		http://download.gna.org/kanicule/freebsd/distfiles/
@@ -36,7 +36,7 @@ post-configure:
 do-install:
 	@${MKDIR} -m 0755 ${PREFIX}/${GLPIDIR}
 	@cd ${WRKSRC} && ${FIND} * -print | ${CPIO} ${CPIOARGS} ${WWWOWN}:${WWWGRP} ${PREFIX}/${GLPIDIR}
-	@${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${GLPIDIR}
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${GLPIDIR}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/glpi/distinfo b/www/glpi/distinfo
index d13d80d09922..26e8304cd42e 100644
--- a/www/glpi/distinfo
+++ b/www/glpi/distinfo
@@ -1,3 +1,3 @@
-MD5 (glpi-0.68.3-2.tar.gz) = 918dbd3cb175625a4421097bbec43cc4
-SHA256 (glpi-0.68.3-2.tar.gz) = 45c2f08cd139da06502a26395999313cfd4a6c01452da812004b526fed0360ef
-SIZE (glpi-0.68.3-2.tar.gz) = 1394598
+MD5 (glpi-0.70.tar.gz) = afcc462da7510109a263ab2aefab34c4
+SHA256 (glpi-0.70.tar.gz) = dc7c1c3662914c4431eefe86e57b3772aa99e2fe2a61a5265b7d01fbaae7d450
+SIZE (glpi-0.70.tar.gz) = 1742816
diff --git a/www/glpi/pkg-plist b/www/glpi/pkg-plist
index f59a7ee006ff..0cbd463fb418 100644
--- a/www/glpi/pkg-plist
+++ b/www/glpi/pkg-plist
@@ -3,8 +3,6 @@ www/glpi/CHANGELOG.txt
 www/glpi/COPYING.txt
 www/glpi/LISEZMOI.txt
 www/glpi/README.txt
-www/glpi/_relpos.php
-www/glpi/ajax/_relpos.php
 www/glpi/ajax/addfollowup.php
 www/glpi/ajax/autocompletion.php
 www/glpi/ajax/comments.php
@@ -14,37 +12,50 @@ www/glpi/ajax/dropdownConnectPort.php
 www/glpi/ajax/dropdownConnectPortDevice.php
 www/glpi/ajax/dropdownConnectPortDeviceType.php
 www/glpi/ajax/dropdownDevice.php
+www/glpi/ajax/dropdownDocument.php
 www/glpi/ajax/dropdownFindNum.php
 www/glpi/ajax/dropdownInstallLicense.php
 www/glpi/ajax/dropdownMassiveAction.php
 www/glpi/ajax/dropdownMassiveActionField.php
 www/glpi/ajax/dropdownMassiveActionPorts.php
+www/glpi/ajax/dropdownNetpoint.php
 www/glpi/ajax/dropdownSelectSoftware.php
 www/glpi/ajax/dropdownTrackingDeviceType.php
 www/glpi/ajax/dropdownUsers.php
 www/glpi/ajax/dropdownUsersTracking.php
 www/glpi/ajax/dropdownValue.php
+www/glpi/ajax/inputtext.php
 www/glpi/ajax/planning.php
 www/glpi/ajax/profiles.php
+www/glpi/ajax/ruleaction.php
+www/glpi/ajax/rulecriteria.php
+www/glpi/ajax/rulecriteriavalue.php
 www/glpi/ajax/textarea.php
+www/glpi/ajax/transfers.php
 www/glpi/ajax/uemailUpdate.php
 www/glpi/ajax/updateLicenses.php
 www/glpi/ajax/updateSearch.php
 www/glpi/ajax/updateTrackingDeviceType.php
 www/glpi/ajax/viewfollowup.php
 www/glpi/config/.htaccess
-www/glpi/config/_relpos.php
 www/glpi/config/based_config.php
 www/glpi/config/config.php
+www/glpi/config/define.php
+www/glpi/css/nothing.gif
 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/win_png.htc
 www/glpi/files/.htaccess
+www/glpi/files/_cache/remove.txt
 www/glpi/files/_cron/remove.txt
 www/glpi/files/_dumps/remove.txt
+www/glpi/files/_lock/remove.txt
+www/glpi/files/_log/remove.txt
+www/glpi/files/_plugins/remove.txt
 www/glpi/files/_sessions/remove.txt
 www/glpi/files/_uploads/remove.txt
-www/glpi/front/_relpos.php
 www/glpi/front/backup.php
 www/glpi/front/cartridge.edit.php
 www/glpi/front/cartridge.form.php
@@ -68,28 +79,40 @@ www/glpi/front/document.php
 www/glpi/front/document.send.php
 www/glpi/front/enterprise.form.php
 www/glpi/front/enterprise.php
-www/glpi/front/faq.php
+www/glpi/front/entity.form.php
+www/glpi/front/entity.php
+www/glpi/front/entity.tree.php
 www/glpi/front/find_num.php
 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/helpdesk.resa.php
 www/glpi/front/index.php
 www/glpi/front/infocom.form.php
 www/glpi/front/infocom.show.php
 www/glpi/front/knowbase.form.php
 www/glpi/front/knowbase.php
+www/glpi/front/ldap.import.php
+www/glpi/front/ldap.parameters.php
+www/glpi/front/ldap.php
+www/glpi/front/ldap.sync.php
 www/glpi/front/link.form.php
 www/glpi/front/link.php
 www/glpi/front/link.send.php
 www/glpi/front/log.php
+www/glpi/front/mailgate.form.php
+www/glpi/front/mailgate.php
 www/glpi/front/massiveaction.php
 www/glpi/front/monitor.form.php
 www/glpi/front/monitor.php
 www/glpi/front/networking.form.php
 www/glpi/front/networking.php
 www/glpi/front/networking.port.php
+www/glpi/front/ocsng.clean.php
+www/glpi/front/ocsng.form.php
 www/glpi/front/ocsng.import.php
 www/glpi/front/ocsng.link.php
 www/glpi/front/ocsng.php
@@ -98,13 +121,13 @@ www/glpi/front/peripheral.form.php
 www/glpi/front/peripheral.php
 www/glpi/front/phone.form.php
 www/glpi/front/phone.php
-www/glpi/front/planning.form.php
 www/glpi/front/planning.ical.php
 www/glpi/front/planning.php
+www/glpi/front/pluginimage.send.php
 www/glpi/front/popup.php
-www/glpi/front/preference.php
 www/glpi/front/printer.form.php
 www/glpi/front/printer.php
+www/glpi/front/profile.form.php
 www/glpi/front/profile.php
 www/glpi/front/reminder.form.php
 www/glpi/front/reminder.php
@@ -123,9 +146,26 @@ www/glpi/front/report.switch.list.php
 www/glpi/front/report.year.list.php
 www/glpi/front/report.year.php
 www/glpi/front/reservation.php
+www/glpi/front/rule.common.form.php
+www/glpi/front/rule.common.php
+www/glpi/front/rule.generic.form.php
+www/glpi/front/rule.ocs.form.php
+www/glpi/front/rule.ocs.php
+www/glpi/front/rule.php
+www/glpi/front/rule.right.form.php
+www/glpi/front/rule.right.php
+www/glpi/front/rule.softwarecategories.form.php
+www/glpi/front/rule.softwarecategories.php
+www/glpi/front/rule.test.php
+www/glpi/front/rule.tracking.form.php
+www/glpi/front/rule.tracking.php
+www/glpi/front/search.php
+www/glpi/front/setup.auth.php
 www/glpi/front/setup.config.php
 www/glpi/front/setup.display.php
 www/glpi/front/setup.dropdowns.php
+www/glpi/front/setup.mailing.php
+www/glpi/front/setup.ocsng.php
 www/glpi/front/setup.php
 www/glpi/front/setup.plugins.php
 www/glpi/front/setup.templates.php
@@ -143,12 +183,14 @@ www/glpi/front/state.php
 www/glpi/front/tracking.form.php
 www/glpi/front/tracking.injector.php
 www/glpi/front/tracking.php
+www/glpi/front/transfer.action.php
+www/glpi/front/transfer.form.php
+www/glpi/front/transfer.php
 www/glpi/front/typedoc.form.php
 www/glpi/front/typedoc.list.php
 www/glpi/front/typedoc.php
 www/glpi/front/user.form.my.php
 www/glpi/front/user.form.php
-www/glpi/front/user.info.php
 www/glpi/front/user.php
 www/glpi/front/user.vcard.php
 www/glpi/help/en_GB.html
@@ -159,11 +201,13 @@ www/glpi/help/hd-es_ES.html
 www/glpi/help/hd-fr_FR.html
 www/glpi/help/hd-it_IT.html
 www/glpi/help/pt_PT.html
-www/glpi/inc/.htaccess
+www/glpi/inc/admininfo.class.php
+www/glpi/inc/ajax.function.php
 www/glpi/inc/auth.class.php
 www/glpi/inc/auth.function.php
 www/glpi/inc/cartridge.class.php
 www/glpi/inc/cartridge.function.php
+www/glpi/inc/central.function.php
 www/glpi/inc/common.function.php
 www/glpi/inc/commondbtm.class.php
 www/glpi/inc/commonitem.class.php
@@ -189,6 +233,8 @@ www/glpi/inc/document.function.php
 www/glpi/inc/dropdown.function.php
 www/glpi/inc/enterprise.class.php
 www/glpi/inc/enterprise.function.php
+www/glpi/inc/entity.class.php
+www/glpi/inc/entity.function.php
 www/glpi/inc/export.function.php
 www/glpi/inc/group.class.php
 www/glpi/inc/group.function.php
@@ -197,9 +243,13 @@ www/glpi/inc/infocom.class.php
 www/glpi/inc/infocom.function.php
 www/glpi/inc/knowbase.class.php
 www/glpi/inc/knowbase.function.php
+www/glpi/inc/ldap.function.php
+www/glpi/inc/ldap.parameters.class.php
 www/glpi/inc/link.class.php
 www/glpi/inc/link.function.php
 www/glpi/inc/log.function.php
+www/glpi/inc/mailgate.class.php
+www/glpi/inc/mailgate.function.php
 www/glpi/inc/mailing.class.php
 www/glpi/inc/mailing.function.php
 www/glpi/inc/monitor.class.php
@@ -214,34 +264,43 @@ www/glpi/inc/planning.function.php
 www/glpi/inc/plugin.function.php
 www/glpi/inc/printer.class.php
 www/glpi/inc/profile.class.php
+www/glpi/inc/profile.function.php
+www/glpi/inc/registry.class.php
+www/glpi/inc/registry.function.php
+www/glpi/inc/relation.constant.php
 www/glpi/inc/reminder.class.php
 www/glpi/inc/reminder.function.php
-www/glpi/inc/report.function.php
 www/glpi/inc/reservation.class.php
 www/glpi/inc/reservation.function.php
+www/glpi/inc/rule.ocs.class.php
+www/glpi/inc/rule.right.class.php
+www/glpi/inc/rule.softwarecategories.class.php
+www/glpi/inc/rule.tracking.class.php
+www/glpi/inc/rules.constant.php
+www/glpi/inc/rulesengine.class.php
+www/glpi/inc/rulesengine.function.php
 www/glpi/inc/search.class.php
+www/glpi/inc/search.constant.php
 www/glpi/inc/search.function.php
 www/glpi/inc/setup.class.php
 www/glpi/inc/setup.function.php
 www/glpi/inc/software.class.php
 www/glpi/inc/software.function.php
 www/glpi/inc/stat.function.php
-www/glpi/inc/state.class.php
 www/glpi/inc/state.function.php
 www/glpi/inc/timer.class.php
 www/glpi/inc/tracking.class.php
 www/glpi/inc/tracking.function.php
+www/glpi/inc/transfer.class.php
 www/glpi/inc/typedoc.class.php
 www/glpi/inc/user.class.php
 www/glpi/inc/user.function.php
 www/glpi/inc/xml.class.php
 www/glpi/index.php
-www/glpi/install/_relpos.php
 www/glpi/install/index.php
 www/glpi/install/install.php
 www/glpi/install/mysql/.htaccess
-www/glpi/install/mysql/glpi-0.68-empty.sql
-www/glpi/install/mysql/glpi-0.68.1-empty.sql
+www/glpi/install/mysql/glpi-0.7-empty.sql
 www/glpi/install/update.php
 www/glpi/install/update_031_04.php
 www/glpi/install/update_042_05.php
@@ -249,10 +308,19 @@ www/glpi/install/update_04_042.php
 www/glpi/install/update_051_06.php
 www/glpi/install/update_05_051.php
 www/glpi/install/update_065_068.php
+www/glpi/install/update_0681_07.php
 www/glpi/install/update_068_0681.php
 www/glpi/install/update_06_065.php
 www/glpi/install/update_content.php
 www/glpi/install/update_to_031.php
+www/glpi/lib/cache_lite/LICENSE
+www/glpi/lib/cache_lite/Lite.php
+www/glpi/lib/cache_lite/Lite/File.php
+www/glpi/lib/cache_lite/Lite/Function.php
+www/glpi/lib/cache_lite/Lite/Output.php
+www/glpi/lib/cache_lite/TODO
+www/glpi/lib/cache_lite/docs/examples
+www/glpi/lib/cache_lite/docs/technical
 www/glpi/lib/calendar/aqua/active-bg.gif
 www/glpi/lib/calendar/aqua/dark-bg.gif
 www/glpi/lib/calendar/aqua/hover-bg.gif
@@ -274,12 +342,17 @@ www/glpi/lib/calendar/images/left_over.gif
 www/glpi/lib/calendar/images/right.gif
 www/glpi/lib/calendar/images/right_over.gif
 www/glpi/lib/calendar/lang/calendar-br.js
+www/glpi/lib/calendar/lang/calendar-ca.js
+www/glpi/lib/calendar/lang/calendar-cs.js
+www/glpi/lib/calendar/lang/calendar-da.js
 www/glpi/lib/calendar/lang/calendar-de.js
+www/glpi/lib/calendar/lang/calendar-el.js
 www/glpi/lib/calendar/lang/calendar-en.js
 www/glpi/lib/calendar/lang/calendar-es.js
 www/glpi/lib/calendar/lang/calendar-fr.js
 www/glpi/lib/calendar/lang/calendar-hu.js
 www/glpi/lib/calendar/lang/calendar-it.js
+www/glpi/lib/calendar/lang/calendar-ja.js
 www/glpi/lib/calendar/lang/calendar-nl.js
 www/glpi/lib/calendar/lang/calendar-pl.js
 www/glpi/lib/calendar/lang/calendar-ro.js
@@ -290,6 +363,7 @@ 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/index.php
+www/glpi/lib/mail/receivemail.class.php
 www/glpi/lib/phpcas/CAS.php
 www/glpi/lib/phpcas/COPYRIGHT
 www/glpi/lib/phpcas/PGTStorage/pgt-db.php
@@ -300,7 +374,9 @@ www/glpi/lib/phpcas/client.php
 www/glpi/lib/phpcas/domxml-php4-php5.php
 www/glpi/lib/phpcas/languages/english.php
 www/glpi/lib/phpcas/languages/french.php
+www/glpi/lib/phpcas/languages/german.php
 www/glpi/lib/phpcas/languages/greek.php
+www/glpi/lib/phpcas/languages/japanese.php
 www/glpi/lib/phpcas/languages/languages.php
 www/glpi/lib/phpmailer/LICENSE
 www/glpi/lib/phpmailer/class.phpmailer.php
@@ -315,9 +391,52 @@ www/glpi/lib/scriptaculous/scriptaculous.js
 www/glpi/lib/scriptaculous/slider.js
 www/glpi/lib/scriptaculous/unittest.js
 www/glpi/lib/tiny_mce/blank.htm
+www/glpi/lib/tiny_mce/langs/ca.js
+www/glpi/lib/tiny_mce/langs/cs.js
+www/glpi/lib/tiny_mce/langs/cy.js
+www/glpi/lib/tiny_mce/langs/da.js
+www/glpi/lib/tiny_mce/langs/de.js
+www/glpi/lib/tiny_mce/langs/el.js
 www/glpi/lib/tiny_mce/langs/en.js
+www/glpi/lib/tiny_mce/langs/es.js
+www/glpi/lib/tiny_mce/langs/fa.js
+www/glpi/lib/tiny_mce/langs/fi.js
 www/glpi/lib/tiny_mce/langs/fr.js
+www/glpi/lib/tiny_mce/langs/fr_ca.js
+www/glpi/lib/tiny_mce/langs/he.js
+www/glpi/lib/tiny_mce/langs/hu.js
+www/glpi/lib/tiny_mce/langs/is.js
+www/glpi/lib/tiny_mce/langs/it.js
+www/glpi/lib/tiny_mce/langs/ja.js
+www/glpi/lib/tiny_mce/langs/ja_euc-jp.js
+www/glpi/lib/tiny_mce/langs/ja_shift_jis.js
+www/glpi/lib/tiny_mce/langs/ja_utf-8.js
+www/glpi/lib/tiny_mce/langs/ko.js
+www/glpi/lib/tiny_mce/langs/nb.js
+www/glpi/lib/tiny_mce/langs/nl.js
+www/glpi/lib/tiny_mce/langs/nn.js
+www/glpi/lib/tiny_mce/langs/pl.js
+www/glpi/lib/tiny_mce/langs/pt_br.js
 www/glpi/lib/tiny_mce/langs/readme.txt
+www/glpi/lib/tiny_mce/langs/ro.js
+www/glpi/lib/tiny_mce/langs/ru.js
+www/glpi/lib/tiny_mce/langs/ru_CP1251.js
+www/glpi/lib/tiny_mce/langs/ru_KOI8-R.js
+www/glpi/lib/tiny_mce/langs/si.js
+www/glpi/lib/tiny_mce/langs/sk.js
+www/glpi/lib/tiny_mce/langs/sq.js
+www/glpi/lib/tiny_mce/langs/sr.js
+www/glpi/lib/tiny_mce/langs/sv.js
+www/glpi/lib/tiny_mce/langs/sv_utf8.js
+www/glpi/lib/tiny_mce/langs/tr.js
+www/glpi/lib/tiny_mce/langs/uk.js
+www/glpi/lib/tiny_mce/langs/uk_CP1251.js
+www/glpi/lib/tiny_mce/langs/uk_KOI8-U.js
+www/glpi/lib/tiny_mce/langs/vi.js
+www/glpi/lib/tiny_mce/langs/zh_cn.js
+www/glpi/lib/tiny_mce/langs/zh_cn_utf8.js
+www/glpi/lib/tiny_mce/langs/zh_tw.js
+www/glpi/lib/tiny_mce/langs/zh_tw_utf8.js
 www/glpi/lib/tiny_mce/license.txt
 www/glpi/lib/tiny_mce/plugins/cleanup/editor_plugin.js
 www/glpi/lib/tiny_mce/plugins/cleanup/editor_plugin_src.js
@@ -326,8 +445,51 @@ www/glpi/lib/tiny_mce/plugins/directionality/editor_plugin.js
 www/glpi/lib/tiny_mce/plugins/directionality/editor_plugin_src.js
 www/glpi/lib/tiny_mce/plugins/directionality/images/ltr.gif
 www/glpi/lib/tiny_mce/plugins/directionality/images/rtl.gif
+www/glpi/lib/tiny_mce/plugins/directionality/langs/ca.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/cs.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/cy.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/da.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/de.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/el.js
 www/glpi/lib/tiny_mce/plugins/directionality/langs/en.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/es.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/fa.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/fi.js
 www/glpi/lib/tiny_mce/plugins/directionality/langs/fr.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/fr_ca.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/he.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/hu.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/is.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/it.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/ja.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/ja_euc-jp.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/ja_shift_jis.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/ja_utf-8.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/ko.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/nb.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/nl.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/nn.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/pl.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/pt_br.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/ro.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/ru.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/ru_CP1251.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/ru_KOI8-R.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/si.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/sk.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/sq.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/sr.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/sv.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/sv_utf8.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/tr.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/uk.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/uk_CP1251.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/uk_KOI8-U.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/vi.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/zh_cn.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/zh_cn_utf8.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/zh_tw.js
+www/glpi/lib/tiny_mce/plugins/directionality/langs/zh_tw_utf8.js
 www/glpi/lib/tiny_mce/plugins/directionality/readme.txt
 www/glpi/lib/tiny_mce/plugins/readme.txt
 www/glpi/lib/tiny_mce/plugins/table/cell.htm
@@ -353,8 +515,51 @@ www/glpi/lib/tiny_mce/plugins/table/jscripts/cell.js
 www/glpi/lib/tiny_mce/plugins/table/jscripts/merge_cells.js
 www/glpi/lib/tiny_mce/plugins/table/jscripts/row.js
 www/glpi/lib/tiny_mce/plugins/table/jscripts/table.js
+www/glpi/lib/tiny_mce/plugins/table/langs/ca.js
+www/glpi/lib/tiny_mce/plugins/table/langs/cs.js
+www/glpi/lib/tiny_mce/plugins/table/langs/cy.js
+www/glpi/lib/tiny_mce/plugins/table/langs/da.js
+www/glpi/lib/tiny_mce/plugins/table/langs/de.js
+www/glpi/lib/tiny_mce/plugins/table/langs/el.js
 www/glpi/lib/tiny_mce/plugins/table/langs/en.js
+www/glpi/lib/tiny_mce/plugins/table/langs/es.js
+www/glpi/lib/tiny_mce/plugins/table/langs/fa.js
+www/glpi/lib/tiny_mce/plugins/table/langs/fi.js
 www/glpi/lib/tiny_mce/plugins/table/langs/fr.js
+www/glpi/lib/tiny_mce/plugins/table/langs/fr_ca.js
+www/glpi/lib/tiny_mce/plugins/table/langs/he.js
+www/glpi/lib/tiny_mce/plugins/table/langs/hu.js
+www/glpi/lib/tiny_mce/plugins/table/langs/is.js
+www/glpi/lib/tiny_mce/plugins/table/langs/it.js
+www/glpi/lib/tiny_mce/plugins/table/langs/ja.js
+www/glpi/lib/tiny_mce/plugins/table/langs/ja_euc-jp.js
+www/glpi/lib/tiny_mce/plugins/table/langs/ja_shift_jis.js
+www/glpi/lib/tiny_mce/plugins/table/langs/ja_utf-8.js
+www/glpi/lib/tiny_mce/plugins/table/langs/ko.js
+www/glpi/lib/tiny_mce/plugins/table/langs/nb.js
+www/glpi/lib/tiny_mce/plugins/table/langs/nl.js
+www/glpi/lib/tiny_mce/plugins/table/langs/nn.js
+www/glpi/lib/tiny_mce/plugins/table/langs/pl.js
+www/glpi/lib/tiny_mce/plugins/table/langs/pt_br.js
+www/glpi/lib/tiny_mce/plugins/table/langs/ro.js
+www/glpi/lib/tiny_mce/plugins/table/langs/ru.js
+www/glpi/lib/tiny_mce/plugins/table/langs/ru_CP1251.js
+www/glpi/lib/tiny_mce/plugins/table/langs/ru_KOI8-R.js
+www/glpi/lib/tiny_mce/plugins/table/langs/si.js
+www/glpi/lib/tiny_mce/plugins/table/langs/sk.js
+www/glpi/lib/tiny_mce/plugins/table/langs/sq.js
+www/glpi/lib/tiny_mce/plugins/table/langs/sr.js
+www/glpi/lib/tiny_mce/plugins/table/langs/sv.js
+www/glpi/lib/tiny_mce/plugins/table/langs/sv_utf8.js
+www/glpi/lib/tiny_mce/plugins/table/langs/tr.js
+www/glpi/lib/tiny_mce/plugins/table/langs/uk.js
+www/glpi/lib/tiny_mce/plugins/table/langs/uk_CP1251.js
+www/glpi/lib/tiny_mce/plugins/table/langs/uk_KOI8-U.js
+www/glpi/lib/tiny_mce/plugins/table/langs/vi.js
+www/glpi/lib/tiny_mce/plugins/table/langs/zh_cn.js
+www/glpi/lib/tiny_mce/plugins/table/langs/zh_cn_utf8.js
+www/glpi/lib/tiny_mce/plugins/table/langs/zh_tw.js
+www/glpi/lib/tiny_mce/plugins/table/langs/zh_tw_utf8.js
 www/glpi/lib/tiny_mce/plugins/table/merge_cells.htm
 www/glpi/lib/tiny_mce/plugins/table/readme.txt
 www/glpi/lib/tiny_mce/plugins/table/row.htm
@@ -363,6 +568,7 @@ www/glpi/lib/tiny_mce/themes/advanced/about.htm
 www/glpi/lib/tiny_mce/themes/advanced/anchor.htm
 www/glpi/lib/tiny_mce/themes/advanced/charmap.htm
 www/glpi/lib/tiny_mce/themes/advanced/color_picker.htm
+www/glpi/lib/tiny_mce/themes/advanced/css/colorpicker.css
 www/glpi/lib/tiny_mce/themes/advanced/css/editor_content.css
 www/glpi/lib/tiny_mce/themes/advanced/css/editor_popup.css
 www/glpi/lib/tiny_mce/themes/advanced/css/editor_ui.css
@@ -401,6 +607,7 @@ www/glpi/lib/tiny_mce/themes/advanced/images/cleanup.gif
 www/glpi/lib/tiny_mce/themes/advanced/images/close.gif
 www/glpi/lib/tiny_mce/themes/advanced/images/code.gif
 www/glpi/lib/tiny_mce/themes/advanced/images/color.gif
+www/glpi/lib/tiny_mce/themes/advanced/images/colors.jpg
 www/glpi/lib/tiny_mce/themes/advanced/images/copy.gif
 www/glpi/lib/tiny_mce/themes/advanced/images/custom_1.gif
 www/glpi/lib/tiny_mce/themes/advanced/images/cut.gif
@@ -454,8 +661,51 @@ www/glpi/lib/tiny_mce/themes/advanced/jscripts/color_picker.js
 www/glpi/lib/tiny_mce/themes/advanced/jscripts/image.js
 www/glpi/lib/tiny_mce/themes/advanced/jscripts/link.js
 www/glpi/lib/tiny_mce/themes/advanced/jscripts/source_editor.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/ca.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/cs.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/cy.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/da.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/de.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/el.js
 www/glpi/lib/tiny_mce/themes/advanced/langs/en.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/es.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/fa.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/fi.js
 www/glpi/lib/tiny_mce/themes/advanced/langs/fr.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/fr_ca.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/he.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/hu.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/is.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/it.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/ja.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/ja_euc-jp.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/ja_shift_jis.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/ja_utf-8.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/ko.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/nb.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/nl.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/nn.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/pl.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/pt_br.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/ro.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/ru.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/ru_CP1251.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/ru_KOI8-R.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/si.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/sk.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/sq.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/sr.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/sv.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/sv_utf8.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/tr.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/uk.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/uk_CP1251.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/uk_KOI8-U.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/vi.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/zh_cn.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/zh_cn_utf8.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/zh_tw.js
+www/glpi/lib/tiny_mce/themes/advanced/langs/zh_tw_utf8.js
 www/glpi/lib/tiny_mce/themes/advanced/link.htm
 www/glpi/lib/tiny_mce/themes/advanced/source_editor.htm
 www/glpi/lib/tiny_mce/themes/simple/css/editor_content.css
@@ -486,9 +736,11 @@ www/glpi/lib/tiny_mce/themes/simple/images/underline_ru.gif
 www/glpi/lib/tiny_mce/themes/simple/images/underline_tw.gif
 www/glpi/lib/tiny_mce/themes/simple/images/undo.gif
 www/glpi/lib/tiny_mce/tiny_mce.js
+www/glpi/lib/tiny_mce/tiny_mce_gzip.js
 www/glpi/lib/tiny_mce/tiny_mce_gzip.php
 www/glpi/lib/tiny_mce/tiny_mce_popup.js
 www/glpi/lib/tiny_mce/tiny_mce_src.js
+www/glpi/lib/tiny_mce/utils/editable_selects.js
 www/glpi/lib/tiny_mce/utils/form_utils.js
 www/glpi/lib/tiny_mce/utils/mclayer.js
 www/glpi/lib/tiny_mce/utils/mctabs.js
@@ -496,15 +748,21 @@ www/glpi/lib/tiny_mce/utils/validate.js
 www/glpi/lib/vcardclass/classes-vcard.php
 www/glpi/locales/.htaccess
 www/glpi/locales/bg_BG.php
+www/glpi/locales/ca_CA.php
+www/glpi/locales/cs_CZ.php
 www/glpi/locales/de_DE.php
+www/glpi/locales/dk_DK.php
+www/glpi/locales/el_EL.php
 www/glpi/locales/en_GB.php
 www/glpi/locales/es_AR.php
 www/glpi/locales/es_ES.php
 www/glpi/locales/fr_FR.php
 www/glpi/locales/hu_HU.php
 www/glpi/locales/it_IT.php
+www/glpi/locales/ja_JP.php
+www/glpi/locales/nl_BE.php
 www/glpi/locales/nl_NL.php
-www/glpi/locales/po_PO.php
+www/glpi/locales/pl_PL.php
 www/glpi/locales/pt_BR.php
 www/glpi/locales/pt_PT.php
 www/glpi/locales/ro_RO.php
@@ -518,43 +776,33 @@ www/glpi/pics/actualiser.png
 www/glpi/pics/add.png
 www/glpi/pics/addresa.png
 www/glpi/pics/aide.png
-www/glpi/pics/ajoutinterv.png
 www/glpi/pics/arrow-left.png
 www/glpi/pics/assign.png
-www/glpi/pics/authentification.png
-www/glpi/pics/barre.png
 www/glpi/pics/bas_install.png
-www/glpi/pics/bleu.png
 www/glpi/pics/calendar.png
-www/glpi/pics/cartouches.png
-www/glpi/pics/centre.png
-www/glpi/pics/clear.png
-www/glpi/pics/code.png
-www/glpi/pics/computer.png
-www/glpi/pics/config.png
-www/glpi/pics/configuration.png
-www/glpi/pics/consommables.png
-www/glpi/pics/contacts.png
-www/glpi/pics/contracts.png
 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/docs.png
 www/glpi/pics/dollar.png
 www/glpi/pics/dollaradd.png
-www/glpi/pics/doublons.png
-www/glpi/pics/ecran.png
 www/glpi/pics/edit.png
-www/glpi/pics/entreprises.png
-www/glpi/pics/export.png
-www/glpi/pics/faq-24.png
+www/glpi/pics/entity_all.png
 www/glpi/pics/faqadd.png
 www/glpi/pics/faqdelete.png
 www/glpi/pics/faqedit.png
 www/glpi/pics/faqremove.png
 www/glpi/pics/favicon.ico
+www/glpi/pics/fd_footer.png
+www/glpi/pics/fd_hoverlink.png
+www/glpi/pics/fd_logo.png
+www/glpi/pics/fd_nav1.png
+www/glpi/pics/fd_nav2.png
+www/glpi/pics/fd_nav3.png
+www/glpi/pics/fd_ssmenu.png
 www/glpi/pics/first.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
@@ -564,17 +812,13 @@ www/glpi/pics/fond_form.png
 www/glpi/pics/fond_form_on.png
 www/glpi/pics/fond_ico_cons.png
 www/glpi/pics/fond_ico_cons_on.png
-www/glpi/pics/fond_ico_sous_nav.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/gestion.png
-www/glpi/pics/grand.png
-www/glpi/pics/gras.png
+www/glpi/pics/greenbutton.png
 www/glpi/pics/groupes.png
 www/glpi/pics/haut_install.png
-www/glpi/pics/help.png
 www/glpi/pics/icones/ai-dist.png
 www/glpi/pics/icones/aiff-dist.png
 www/glpi/pics/icones/asf-dist.png
@@ -637,50 +881,41 @@ www/glpi/pics/icones/xcf-dist.png
 www/glpi/pics/icones/xls-dist.png
 www/glpi/pics/icones/xml-dist.png
 www/glpi/pics/icones/zip-dist.png
-www/glpi/pics/inventaire.png
-www/glpi/pics/italique.png
-www/glpi/pics/jaune.png
-www/glpi/pics/key.png
-www/glpi/pics/knowbase.png
 www/glpi/pics/last.png
-www/glpi/pics/ldap.png
 www/glpi/pics/left.png
-www/glpi/pics/links.png
-www/glpi/pics/logiciels.png
 www/glpi/pics/login_glpi.png
 www/glpi/pics/logo-glpi-login.png
-www/glpi/pics/logo-glpi.png
 www/glpi/pics/logoOcs.png
-www/glpi/pics/logout.png
-www/glpi/pics/mail.png
-www/glpi/pics/maintenance.png
+www/glpi/pics/menu_add.png
+www/glpi/pics/menu_add_off.png
+www/glpi/pics/menu_addtemplate.png
+www/glpi/pics/menu_all.png
+www/glpi/pics/menu_calendar.png
+www/glpi/pics/menu_config.png
+www/glpi/pics/menu_search.png
+www/glpi/pics/menu_search_off.png
+www/glpi/pics/menu_show.png
+www/glpi/pics/menu_showall.png
 www/glpi/pics/meta_moins.png
 www/glpi/pics/meta_plus.png
 www/glpi/pics/milieu_install.png
 www/glpi/pics/moins.png
 www/glpi/pics/moyenne.png
-www/glpi/pics/networking.png
 www/glpi/pics/new.png
 www/glpi/pics/noir.png
+www/glpi/pics/null-header.png
 www/glpi/pics/ok.png
+www/glpi/pics/ok2.png
 www/glpi/pics/old_done.png
 www/glpi/pics/old_notdone.png
-www/glpi/pics/outils.png
+www/glpi/pics/options_search.png
 www/glpi/pics/pdf.png
 www/glpi/pics/periph.png
-www/glpi/pics/periphs.png
-www/glpi/pics/phones.png
 www/glpi/pics/plan.png
-www/glpi/pics/plugins.png
 www/glpi/pics/plus.png
-www/glpi/pics/preferences.png
-www/glpi/pics/printer.png
-www/glpi/pics/profils.png
 www/glpi/pics/puce-delete2.png
-www/glpi/pics/puce-down.gif
 www/glpi/pics/puce-down.png
 www/glpi/pics/puce-down2.png
-www/glpi/pics/puce-up.gif
 www/glpi/pics/puce-up.png
 www/glpi/pics/puce-up2.png
 www/glpi/pics/puce.gif
@@ -689,23 +924,17 @@ www/glpi/pics/rdv.png
 www/glpi/pics/rdv_interv.png
 www/glpi/pics/rdv_private.png
 www/glpi/pics/rdv_public.png
-www/glpi/pics/reminder.png
+www/glpi/pics/redbutton.png
 www/glpi/pics/remove.png
-www/glpi/pics/reservation-2.png
+www/glpi/pics/reservation-3.png
 www/glpi/pics/reservation.png
 www/glpi/pics/reset.png
 www/glpi/pics/rien.gif
 www/glpi/pics/right.png
-www/glpi/pics/rouge.png
 www/glpi/pics/sauvegardes.png
 www/glpi/pics/showdeleted.png
 www/glpi/pics/slk.png
-www/glpi/pics/souligne.png
-www/glpi/pics/statistiques.png
 www/glpi/pics/stats_item.png
-www/glpi/pics/status.png
-www/glpi/pics/suivi-intervention.png
-www/glpi/pics/suivi.png
 www/glpi/pics/treeroot.png
 www/glpi/pics/users.png
 www/glpi/pics/wait.png
@@ -714,7 +943,12 @@ www/glpi/pics/warning.png
 www/glpi/pics/web.png
 www/glpi/plugins/remove.txt
 www/glpi/script.js
-www/glpi/siteroot.php
+www/glpi/scripts/.htaccess
+www/glpi/scripts/ldap_mass_sync.php
+www/glpi/scripts/ocsng_mass_import.php
+www/glpi/scripts/ocsng_mass_sync.php
+www/glpi/scripts/softcat_mass_compute.php
+@dirrm www/glpi/scripts
 @dirrm www/glpi/plugins
 @dirrm www/glpi/pics/icones
 @dirrm www/glpi/pics
@@ -752,12 +986,16 @@ www/glpi/siteroot.php
 @dirrm www/glpi/lib/phpcas/languages
 @dirrm www/glpi/lib/phpcas/PGTStorage
 @dirrm www/glpi/lib/phpcas
+@dirrm www/glpi/lib/mail
 @dirrm www/glpi/lib/ezpdf/fonts
 @dirrm www/glpi/lib/ezpdf
 @dirrm www/glpi/lib/calendar/lang
 @dirrm www/glpi/lib/calendar/images
 @dirrm www/glpi/lib/calendar/aqua
 @dirrm www/glpi/lib/calendar
+@dirrm www/glpi/lib/cache_lite/docs
+@dirrm www/glpi/lib/cache_lite/Lite
+@dirrm www/glpi/lib/cache_lite
 @dirrm www/glpi/lib
 @dirrm www/glpi/install/mysql
 @dirrm www/glpi/install
@@ -765,11 +1003,15 @@ www/glpi/siteroot.php
 @dirrm www/glpi/help
 @dirrm www/glpi/front
 @dirrm www/glpi/files/_uploads
-@dirrm www/glpi/files/_sessions
+@dirrmtry www/glpi/files/_sessions
+@dirrm www/glpi/files/_plugins
+@dirrm www/glpi/files/_log
+@dirrm www/glpi/files/_lock
 @dirrm www/glpi/files/_dumps
-@dirrm www/glpi/files/_cron
+@dirrmtry www/glpi/files/_cron
+@dirrmtry www/glpi/files/_cache
 @dirrmtry www/glpi/files
 @dirrm www/glpi/css
-@dirrmtry www/glpi/config
 @dirrm www/glpi/ajax
+@dirrmtry www/glpi/config
 @dirrmtry www/glpi