".$LANG['buttons'][60]."";
@@ -115,4 +108,4 @@
popFooter();
}
-?>
\ No newline at end of file
+?>
diff -Nru glpi-0.80.5/front/preference.php glpi-0.80.7/front/preference.php
--- glpi-0.80.5/front/preference.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/preference.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/printer.form.php glpi-0.80.7/front/printer.form.php
--- glpi-0.80.5/front/printer.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/printer.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/printermodel.form.php glpi-0.80.7/front/printermodel.form.php
--- glpi-0.80.5/front/printermodel.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/printermodel.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/printermodel.php glpi-0.80.7/front/printermodel.php
--- glpi-0.80.5/front/printermodel.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/printermodel.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/printer.php glpi-0.80.7/front/printer.php
--- glpi-0.80.5/front/printer.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/printer.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/printertype.form.php glpi-0.80.7/front/printertype.form.php
--- glpi-0.80.5/front/printertype.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/printertype.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/printertype.php glpi-0.80.7/front/printertype.php
--- glpi-0.80.5/front/printertype.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/printertype.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/profile.form.php glpi-0.80.7/front/profile.form.php
--- glpi-0.80.5/front/profile.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/profile.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/profile.php glpi-0.80.7/front/profile.php
--- glpi-0.80.5/front/profile.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/profile.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/profile_user.form.php glpi-0.80.7/front/profile_user.form.php
--- glpi-0.80.5/front/profile_user.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/profile_user.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/reminder.form.php glpi-0.80.7/front/reminder.form.php
--- glpi-0.80.5/front/reminder.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/reminder.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/reminder.php glpi-0.80.7/front/reminder.php
--- glpi-0.80.5/front/reminder.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/reminder.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/report.contract.list.php glpi-0.80.7/front/report.contract.list.php
--- glpi-0.80.5/front/report.contract.list.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/report.contract.list.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/report.contract.php glpi-0.80.7/front/report.contract.php
--- glpi-0.80.5/front/report.contract.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/report.contract.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/report.default.php glpi-0.80.7/front/report.default.php
--- glpi-0.80.5/front/report.default.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/report.default.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/report.dynamic.php glpi-0.80.7/front/report.dynamic.php
--- glpi-0.80.5/front/report.dynamic.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/report.dynamic.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/report.infocom.conso.php glpi-0.80.7/front/report.infocom.conso.php
--- glpi-0.80.5/front/report.infocom.conso.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/report.infocom.conso.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/report.infocom.php glpi-0.80.7/front/report.infocom.php
--- glpi-0.80.5/front/report.infocom.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/report.infocom.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/report.location.list.php glpi-0.80.7/front/report.location.list.php
--- glpi-0.80.5/front/report.location.list.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/report.location.list.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/report.netpoint.list.php glpi-0.80.7/front/report.netpoint.list.php
--- glpi-0.80.5/front/report.netpoint.list.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/report.netpoint.list.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
/*!
diff -Nru glpi-0.80.5/front/report.networking.php glpi-0.80.7/front/report.networking.php
--- glpi-0.80.5/front/report.networking.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/report.networking.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
/*!
diff -Nru glpi-0.80.5/front/report.php glpi-0.80.7/front/report.php
--- glpi-0.80.5/front/report.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/report.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/report.reservation.php glpi-0.80.7/front/report.reservation.php
--- glpi-0.80.5/front/report.reservation.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/report.reservation.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/report.switch.list.php glpi-0.80.7/front/report.switch.list.php
--- glpi-0.80.5/front/report.switch.list.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/report.switch.list.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
/*!
diff -Nru glpi-0.80.5/front/report.year.list.php glpi-0.80.7/front/report.year.list.php
--- glpi-0.80.5/front/report.year.list.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/report.year.list.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/report.year.php glpi-0.80.7/front/report.year.php
--- glpi-0.80.5/front/report.year.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/report.year.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/requesttype.form.php glpi-0.80.7/front/requesttype.form.php
--- glpi-0.80.5/front/requesttype.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/requesttype.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/requesttype.php glpi-0.80.7/front/requesttype.php
--- glpi-0.80.5/front/requesttype.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/requesttype.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/reservation.form.php glpi-0.80.7/front/reservation.form.php
--- glpi-0.80.5/front/reservation.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/reservation.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
@@ -91,8 +90,9 @@
$_POST['_ok'] = true;
for ($i=0 ; $i<$times && ($_POST['_ok']) ; $i++) {
- $_POST["begin"] = date('Y-m-d H:i:s', strtotime($begin)+$i*$to_add*DAY_TIMESTAMP);
- $_POST["end"] = date('Y-m-d H:i:s', strtotime($end)+$i*$to_add*DAY_TIMESTAMP);
+
+ $_POST["begin"] = date('Y-m-d H:i:s', strtotime($begin." +".($i*$to_add)." day"));
+ $_POST["end"] = date('Y-m-d H:i:s', strtotime($end." +".($i*$to_add)." day"));
if (haveRight("reservation_central","w")
|| getLoginUserID() === $_POST["users_id"]) {
@@ -116,6 +116,8 @@
// Only one reservation
if (count($_POST['items']) == 1) {
$toadd = "?reservationitems_id=$reservationitems_id";
+ $toadd .= "&mois_courant=".$_GET["mois_courant"];
+ $toadd .= "&annee_courante=".$_GET["annee_courant"];
}
glpi_header($CFG_GLPI["root_doc"] . "/front/reservation.php$toadd");
}
diff -Nru glpi-0.80.5/front/reservationitem.form.php glpi-0.80.7/front/reservationitem.form.php
--- glpi-0.80.5/front/reservationitem.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/reservationitem.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/reservationitem.php glpi-0.80.7/front/reservationitem.php
--- glpi-0.80.5/front/reservationitem.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/reservationitem.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/reservation.php glpi-0.80.7/front/reservation.php
--- glpi-0.80.5/front/reservation.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/reservation.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/rule.cache.php glpi-0.80.7/front/rule.cache.php
--- glpi-0.80.5/front/rule.cache.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/rule.cache.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/rule.common.form.php glpi-0.80.7/front/rule.common.form.php
--- glpi-0.80.5/front/rule.common.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/rule.common.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/rule.common.php glpi-0.80.7/front/rule.common.php
--- glpi-0.80.5/front/rule.common.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/rule.common.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnarycomputermodel.form.php glpi-0.80.7/front/ruledictionnarycomputermodel.form.php
--- glpi-0.80.5/front/ruledictionnarycomputermodel.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnarycomputermodel.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnarycomputermodel.php glpi-0.80.7/front/ruledictionnarycomputermodel.php
--- glpi-0.80.5/front/ruledictionnarycomputermodel.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnarycomputermodel.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnarycomputertype.form.php glpi-0.80.7/front/ruledictionnarycomputertype.form.php
--- glpi-0.80.5/front/ruledictionnarycomputertype.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnarycomputertype.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnarycomputertype.php glpi-0.80.7/front/ruledictionnarycomputertype.php
--- glpi-0.80.5/front/ruledictionnarycomputertype.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnarycomputertype.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnarymanufacturer.form.php glpi-0.80.7/front/ruledictionnarymanufacturer.form.php
--- glpi-0.80.5/front/ruledictionnarymanufacturer.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnarymanufacturer.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnarymanufacturer.php glpi-0.80.7/front/ruledictionnarymanufacturer.php
--- glpi-0.80.5/front/ruledictionnarymanufacturer.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnarymanufacturer.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnarymonitormodel.form.php glpi-0.80.7/front/ruledictionnarymonitormodel.form.php
--- glpi-0.80.5/front/ruledictionnarymonitormodel.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnarymonitormodel.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnarymonitormodel.php glpi-0.80.7/front/ruledictionnarymonitormodel.php
--- glpi-0.80.5/front/ruledictionnarymonitormodel.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnarymonitormodel.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnarymonitortype.form.php glpi-0.80.7/front/ruledictionnarymonitortype.form.php
--- glpi-0.80.5/front/ruledictionnarymonitortype.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnarymonitortype.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnarymonitortype.php glpi-0.80.7/front/ruledictionnarymonitortype.php
--- glpi-0.80.5/front/ruledictionnarymonitortype.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnarymonitortype.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnarynetworkequipmentmodel.form.php glpi-0.80.7/front/ruledictionnarynetworkequipmentmodel.form.php
--- glpi-0.80.5/front/ruledictionnarynetworkequipmentmodel.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnarynetworkequipmentmodel.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnarynetworkequipmentmodel.php glpi-0.80.7/front/ruledictionnarynetworkequipmentmodel.php
--- glpi-0.80.5/front/ruledictionnarynetworkequipmentmodel.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnarynetworkequipmentmodel.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnarynetworkequipmenttype.form.php glpi-0.80.7/front/ruledictionnarynetworkequipmenttype.form.php
--- glpi-0.80.5/front/ruledictionnarynetworkequipmenttype.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnarynetworkequipmenttype.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnarynetworkequipmenttype.php glpi-0.80.7/front/ruledictionnarynetworkequipmenttype.php
--- glpi-0.80.5/front/ruledictionnarynetworkequipmenttype.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnarynetworkequipmenttype.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnaryoperatingsystem.form.php glpi-0.80.7/front/ruledictionnaryoperatingsystem.form.php
--- glpi-0.80.5/front/ruledictionnaryoperatingsystem.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnaryoperatingsystem.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnaryoperatingsystem.php glpi-0.80.7/front/ruledictionnaryoperatingsystem.php
--- glpi-0.80.5/front/ruledictionnaryoperatingsystem.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnaryoperatingsystem.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnaryoperatingsystemservicepack.form.php glpi-0.80.7/front/ruledictionnaryoperatingsystemservicepack.form.php
--- glpi-0.80.5/front/ruledictionnaryoperatingsystemservicepack.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnaryoperatingsystemservicepack.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnaryoperatingsystemservicepack.php glpi-0.80.7/front/ruledictionnaryoperatingsystemservicepack.php
--- glpi-0.80.5/front/ruledictionnaryoperatingsystemservicepack.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnaryoperatingsystemservicepack.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnaryoperatingsystemversion.form.php glpi-0.80.7/front/ruledictionnaryoperatingsystemversion.form.php
--- glpi-0.80.5/front/ruledictionnaryoperatingsystemversion.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnaryoperatingsystemversion.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnaryoperatingsystemversion.php glpi-0.80.7/front/ruledictionnaryoperatingsystemversion.php
--- glpi-0.80.5/front/ruledictionnaryoperatingsystemversion.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnaryoperatingsystemversion.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnaryperipheralmodel.form.php glpi-0.80.7/front/ruledictionnaryperipheralmodel.form.php
--- glpi-0.80.5/front/ruledictionnaryperipheralmodel.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnaryperipheralmodel.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnaryperipheralmodel.php glpi-0.80.7/front/ruledictionnaryperipheralmodel.php
--- glpi-0.80.5/front/ruledictionnaryperipheralmodel.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnaryperipheralmodel.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnaryperipheraltype.form.php glpi-0.80.7/front/ruledictionnaryperipheraltype.form.php
--- glpi-0.80.5/front/ruledictionnaryperipheraltype.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnaryperipheraltype.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnaryperipheraltype.php glpi-0.80.7/front/ruledictionnaryperipheraltype.php
--- glpi-0.80.5/front/ruledictionnaryperipheraltype.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnaryperipheraltype.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnaryphonemodel.form.php glpi-0.80.7/front/ruledictionnaryphonemodel.form.php
--- glpi-0.80.5/front/ruledictionnaryphonemodel.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnaryphonemodel.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnaryphonemodel.php glpi-0.80.7/front/ruledictionnaryphonemodel.php
--- glpi-0.80.5/front/ruledictionnaryphonemodel.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnaryphonemodel.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnaryphonetype.form.php glpi-0.80.7/front/ruledictionnaryphonetype.form.php
--- glpi-0.80.5/front/ruledictionnaryphonetype.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnaryphonetype.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnaryphonetype.php glpi-0.80.7/front/ruledictionnaryphonetype.php
--- glpi-0.80.5/front/ruledictionnaryphonetype.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnaryphonetype.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnaryprinter.form.php glpi-0.80.7/front/ruledictionnaryprinter.form.php
--- glpi-0.80.5/front/ruledictionnaryprinter.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnaryprinter.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnaryprintermodel.form.php glpi-0.80.7/front/ruledictionnaryprintermodel.form.php
--- glpi-0.80.5/front/ruledictionnaryprintermodel.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnaryprintermodel.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnaryprintermodel.php glpi-0.80.7/front/ruledictionnaryprintermodel.php
--- glpi-0.80.5/front/ruledictionnaryprintermodel.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnaryprintermodel.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnaryprinter.php glpi-0.80.7/front/ruledictionnaryprinter.php
--- glpi-0.80.5/front/ruledictionnaryprinter.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnaryprinter.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnaryprintertype.form.php glpi-0.80.7/front/ruledictionnaryprintertype.form.php
--- glpi-0.80.5/front/ruledictionnaryprintertype.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnaryprintertype.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnaryprintertype.php glpi-0.80.7/front/ruledictionnaryprintertype.php
--- glpi-0.80.5/front/ruledictionnaryprintertype.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnaryprintertype.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnarysoftware.form.php glpi-0.80.7/front/ruledictionnarysoftware.form.php
--- glpi-0.80.5/front/ruledictionnarysoftware.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnarysoftware.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruledictionnarysoftware.php glpi-0.80.7/front/ruledictionnarysoftware.php
--- glpi-0.80.5/front/ruledictionnarysoftware.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruledictionnarysoftware.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/rule.generic.form.php glpi-0.80.7/front/rule.generic.form.php
--- glpi-0.80.5/front/rule.generic.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/rule.generic.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruleimportcomputer.form.php glpi-0.80.7/front/ruleimportcomputer.form.php
--- glpi-0.80.5/front/ruleimportcomputer.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruleimportcomputer.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruleimportcomputer.php glpi-0.80.7/front/ruleimportcomputer.php
--- glpi-0.80.5/front/ruleimportcomputer.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruleimportcomputer.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/rulemailcollector.form.php glpi-0.80.7/front/rulemailcollector.form.php
--- glpi-0.80.5/front/rulemailcollector.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/rulemailcollector.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/rulemailcollector.php glpi-0.80.7/front/rulemailcollector.php
--- glpi-0.80.5/front/rulemailcollector.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/rulemailcollector.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruleocs.form.php glpi-0.80.7/front/ruleocs.form.php
--- glpi-0.80.5/front/ruleocs.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruleocs.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruleocs.php glpi-0.80.7/front/ruleocs.php
--- glpi-0.80.5/front/ruleocs.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruleocs.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/rule.php glpi-0.80.7/front/rule.php
--- glpi-0.80.5/front/rule.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/rule.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruleright.form.php glpi-0.80.7/front/ruleright.form.php
--- glpi-0.80.5/front/ruleright.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruleright.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/rulerightparameter.form.php glpi-0.80.7/front/rulerightparameter.form.php
--- glpi-0.80.5/front/rulerightparameter.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/rulerightparameter.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/rulerightparameter.php glpi-0.80.7/front/rulerightparameter.php
--- glpi-0.80.5/front/rulerightparameter.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/rulerightparameter.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruleright.php glpi-0.80.7/front/ruleright.php
--- glpi-0.80.5/front/ruleright.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruleright.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/rulesengine.test.php glpi-0.80.7/front/rulesengine.test.php
--- glpi-0.80.5/front/rulesengine.test.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/rulesengine.test.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/rulesoftwarecategory.form.php glpi-0.80.7/front/rulesoftwarecategory.form.php
--- glpi-0.80.5/front/rulesoftwarecategory.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/rulesoftwarecategory.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/rulesoftwarecategory.php glpi-0.80.7/front/rulesoftwarecategory.php
--- glpi-0.80.5/front/rulesoftwarecategory.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/rulesoftwarecategory.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/rule.test.php glpi-0.80.7/front/rule.test.php
--- glpi-0.80.5/front/rule.test.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/rule.test.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruleticket.form.php glpi-0.80.7/front/ruleticket.form.php
--- glpi-0.80.5/front/ruleticket.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruleticket.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ruleticket.php glpi-0.80.7/front/ruleticket.php
--- glpi-0.80.5/front/ruleticket.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ruleticket.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/search.php glpi-0.80.7/front/search.php
--- glpi-0.80.5/front/search.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/search.php 2012-02-09 20:24:12.000000000 +0000
@@ -2,10 +2,10 @@
/*
- * @version $Id: search.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: search.php 17154 2012-01-24 11:27:36Z moyo $
-------------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2003-2011 by the INDEPNET Development Team.
+ Copyright (C) 2003-2012 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi-project.org
-------------------------------------------------------------------------
@@ -25,8 +25,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with GLPI; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ along with GLPI. If not, see
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/setup.auth.php glpi-0.80.7/front/setup.auth.php
--- glpi-0.80.5/front/setup.auth.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/setup.auth.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/setup.notification.php glpi-0.80.7/front/setup.notification.php
--- glpi-0.80.5/front/setup.notification.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/setup.notification.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/setup.templates.php glpi-0.80.7/front/setup.templates.php
--- glpi-0.80.5/front/setup.templates.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/setup.templates.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/sla.form.php glpi-0.80.7/front/sla.form.php
--- glpi-0.80.5/front/sla.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/sla.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/slalevel.form.php glpi-0.80.7/front/slalevel.form.php
--- glpi-0.80.5/front/slalevel.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/slalevel.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/sla.php glpi-0.80.7/front/sla.php
--- glpi-0.80.5/front/sla.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/sla.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/softwarecategory.form.php glpi-0.80.7/front/softwarecategory.form.php
--- glpi-0.80.5/front/softwarecategory.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/softwarecategory.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/softwarecategory.php glpi-0.80.7/front/softwarecategory.php
--- glpi-0.80.5/front/softwarecategory.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/softwarecategory.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/software.form.php glpi-0.80.7/front/software.form.php
--- glpi-0.80.5/front/software.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/software.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/softwarelicense.form.php glpi-0.80.7/front/softwarelicense.form.php
--- glpi-0.80.5/front/softwarelicense.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/softwarelicense.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/softwarelicensetype.form.php glpi-0.80.7/front/softwarelicensetype.form.php
--- glpi-0.80.5/front/softwarelicensetype.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/softwarelicensetype.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/softwarelicensetype.php glpi-0.80.7/front/softwarelicensetype.php
--- glpi-0.80.5/front/softwarelicensetype.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/softwarelicensetype.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/software.php glpi-0.80.7/front/software.php
--- glpi-0.80.5/front/software.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/software.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/softwareversion.form.php glpi-0.80.7/front/softwareversion.form.php
--- glpi-0.80.5/front/softwareversion.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/softwareversion.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/state.form.php glpi-0.80.7/front/state.form.php
--- glpi-0.80.5/front/state.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/state.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/state.php glpi-0.80.7/front/state.php
--- glpi-0.80.5/front/state.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/state.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/states.php glpi-0.80.7/front/states.php
--- glpi-0.80.5/front/states.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/states.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/stat.global.php glpi-0.80.7/front/stat.global.php
--- glpi-0.80.5/front/stat.global.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/stat.global.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/stat.graph.php glpi-0.80.7/front/stat.graph.php
--- glpi-0.80.5/front/stat.graph.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/stat.graph.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
@@ -197,7 +196,7 @@
$next = $prev = 0;
$next = getNextItem("glpi_ticketsolutiontypes", $_GET["id"]);
$prev = getPreviousItem("glpi_ticketsolutiontypes", $_GET["id"]);
- $title = $LANG['users'][1]." : ".Dropdown::getDropdownName("glpi_ticketsolutiontypes",
+ $title = $LANG['job'][48]." : ".Dropdown::getDropdownName("glpi_ticketsolutiontypes",
$_GET["id"]);
break;
diff -Nru glpi-0.80.5/front/stat.item.php glpi-0.80.7/front/stat.item.php
--- glpi-0.80.5/front/stat.item.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/stat.item.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/stat.location.php glpi-0.80.7/front/stat.location.php
--- glpi-0.80.5/front/stat.location.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/stat.location.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/stat.php glpi-0.80.7/front/stat.php
--- glpi-0.80.5/front/stat.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/stat.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/stat.tracking.php glpi-0.80.7/front/stat.tracking.php
--- glpi-0.80.5/front/stat.tracking.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/stat.tracking.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/supplier.form.php glpi-0.80.7/front/supplier.form.php
--- glpi-0.80.5/front/supplier.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/supplier.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/supplier.php glpi-0.80.7/front/supplier.php
--- glpi-0.80.5/front/supplier.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/supplier.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/suppliertype.form.php glpi-0.80.7/front/suppliertype.form.php
--- glpi-0.80.5/front/suppliertype.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/suppliertype.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/suppliertype.php glpi-0.80.7/front/suppliertype.php
--- glpi-0.80.5/front/suppliertype.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/suppliertype.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/taskcategory.form.php glpi-0.80.7/front/taskcategory.form.php
--- glpi-0.80.5/front/taskcategory.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/taskcategory.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/taskcategory.php glpi-0.80.7/front/taskcategory.php
--- glpi-0.80.5/front/taskcategory.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/taskcategory.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ticketcategory.form.php glpi-0.80.7/front/ticketcategory.form.php
--- glpi-0.80.5/front/ticketcategory.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ticketcategory.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ticketcategory.php glpi-0.80.7/front/ticketcategory.php
--- glpi-0.80.5/front/ticketcategory.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ticketcategory.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ticketfollowup.form.php glpi-0.80.7/front/ticketfollowup.form.php
--- glpi-0.80.5/front/ticketfollowup.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ticketfollowup.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ticket.form.php glpi-0.80.7/front/ticket.form.php
--- glpi-0.80.5/front/ticket.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ticket.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ticket.php glpi-0.80.7/front/ticket.php
--- glpi-0.80.5/front/ticket.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ticket.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ticketsatisfaction.form.php glpi-0.80.7/front/ticketsatisfaction.form.php
--- glpi-0.80.5/front/ticketsatisfaction.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ticketsatisfaction.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ticketsolutiontemplate.form.php glpi-0.80.7/front/ticketsolutiontemplate.form.php
--- glpi-0.80.5/front/ticketsolutiontemplate.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ticketsolutiontemplate.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ticketsolutiontemplate.php glpi-0.80.7/front/ticketsolutiontemplate.php
--- glpi-0.80.5/front/ticketsolutiontemplate.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ticketsolutiontemplate.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ticketsolutiontype.form.php glpi-0.80.7/front/ticketsolutiontype.form.php
--- glpi-0.80.5/front/ticketsolutiontype.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ticketsolutiontype.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ticketsolutiontype.php glpi-0.80.7/front/ticketsolutiontype.php
--- glpi-0.80.5/front/ticketsolutiontype.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ticketsolutiontype.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/tickettask.form.php glpi-0.80.7/front/tickettask.form.php
--- glpi-0.80.5/front/tickettask.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/tickettask.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ticket_user.form.php glpi-0.80.7/front/ticket_user.form.php
--- glpi-0.80.5/front/ticket_user.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ticket_user.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/ticketvalidation.form.php glpi-0.80.7/front/ticketvalidation.form.php
--- glpi-0.80.5/front/ticketvalidation.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ticketvalidation.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/tracking.injector.php glpi-0.80.7/front/tracking.injector.php
--- glpi-0.80.5/front/tracking.injector.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/tracking.injector.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/transfer.action.php glpi-0.80.7/front/transfer.action.php
--- glpi-0.80.5/front/transfer.action.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/transfer.action.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/transfer.form.php glpi-0.80.7/front/transfer.form.php
--- glpi-0.80.5/front/transfer.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/transfer.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/transfer.php glpi-0.80.7/front/transfer.php
--- glpi-0.80.5/front/transfer.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/transfer.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/usercategory.form.php glpi-0.80.7/front/usercategory.form.php
--- glpi-0.80.5/front/usercategory.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/usercategory.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/usercategory.php glpi-0.80.7/front/usercategory.php
--- glpi-0.80.5/front/usercategory.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/usercategory.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/user.form.php glpi-0.80.7/front/user.form.php
--- glpi-0.80.5/front/user.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/user.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/user.php glpi-0.80.7/front/user.php
--- glpi-0.80.5/front/user.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/user.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/usertitle.form.php glpi-0.80.7/front/usertitle.form.php
--- glpi-0.80.5/front/usertitle.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/usertitle.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/usertitle.php glpi-0.80.7/front/usertitle.php
--- glpi-0.80.5/front/usertitle.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/usertitle.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/virtualmachinestate.form.php glpi-0.80.7/front/virtualmachinestate.form.php
--- glpi-0.80.5/front/virtualmachinestate.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/virtualmachinestate.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/virtualmachinestate.php glpi-0.80.7/front/virtualmachinestate.php
--- glpi-0.80.5/front/virtualmachinestate.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/virtualmachinestate.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/virtualmachinesystem.form.php glpi-0.80.7/front/virtualmachinesystem.form.php
--- glpi-0.80.5/front/virtualmachinesystem.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/virtualmachinesystem.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/virtualmachinesystem.php glpi-0.80.7/front/virtualmachinesystem.php
--- glpi-0.80.5/front/virtualmachinesystem.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/virtualmachinesystem.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/virtualmachinetype.form.php glpi-0.80.7/front/virtualmachinetype.form.php
--- glpi-0.80.5/front/virtualmachinetype.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/virtualmachinetype.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/virtualmachinetype.php glpi-0.80.7/front/virtualmachinetype.php
--- glpi-0.80.5/front/virtualmachinetype.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/virtualmachinetype.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/vlan.form.php glpi-0.80.7/front/vlan.form.php
--- glpi-0.80.5/front/vlan.form.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/vlan.form.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/front/vlan.php glpi-0.80.7/front/vlan.php
--- glpi-0.80.5/front/vlan.php 2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/vlan.php 2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ajax.function.php glpi-0.80.7/inc/ajax.function.php
--- glpi-0.80.5/inc/ajax.function.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ajax.function.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/alert.class.php glpi-0.80.7/inc/alert.class.php
--- glpi-0.80.5/inc/alert.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/alert.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/auth.class.php glpi-0.80.7/inc/auth.class.php
--- glpi-0.80.5/inc/auth.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/auth.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/auth.function.php glpi-0.80.7/inc/auth.function.php
--- glpi-0.80.5/inc/auth.function.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/auth.function.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/authldap.class.php glpi-0.80.7/inc/authldap.class.php
--- glpi-0.80.5/inc/authldap.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/authldap.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/authldapreplicate.class.php glpi-0.80.7/inc/authldapreplicate.class.php
--- glpi-0.80.5/inc/authldapreplicate.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/authldapreplicate.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/authmail.class.php glpi-0.80.7/inc/authmail.class.php
--- glpi-0.80.5/inc/authmail.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/authmail.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/autoupdatesystem.class.php glpi-0.80.7/inc/autoupdatesystem.class.php
--- glpi-0.80.5/inc/autoupdatesystem.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/autoupdatesystem.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/bookmark.class.php glpi-0.80.7/inc/bookmark.class.php
--- glpi-0.80.5/inc/bookmark.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/bookmark.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/bookmark_user.class.php glpi-0.80.7/inc/bookmark_user.class.php
--- glpi-0.80.5/inc/bookmark_user.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/bookmark_user.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/budget.class.php glpi-0.80.7/inc/budget.class.php
--- glpi-0.80.5/inc/budget.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/budget.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/calendar.class.php glpi-0.80.7/inc/calendar.class.php
--- glpi-0.80.5/inc/calendar.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/calendar.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/calendar_holiday.class.php glpi-0.80.7/inc/calendar_holiday.class.php
--- glpi-0.80.5/inc/calendar_holiday.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/calendar_holiday.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/calendarsegment.class.php glpi-0.80.7/inc/calendarsegment.class.php
--- glpi-0.80.5/inc/calendarsegment.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/calendarsegment.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/cartridge.class.php glpi-0.80.7/inc/cartridge.class.php
--- glpi-0.80.5/inc/cartridge.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/cartridge.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/cartridgeitem.class.php glpi-0.80.7/inc/cartridgeitem.class.php
--- glpi-0.80.5/inc/cartridgeitem.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/cartridgeitem.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/cartridgeitemtype.class.php glpi-0.80.7/inc/cartridgeitemtype.class.php
--- glpi-0.80.5/inc/cartridgeitemtype.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/cartridgeitemtype.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/central.class.php glpi-0.80.7/inc/central.class.php
--- glpi-0.80.5/inc/central.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/central.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/commondbchild.class.php glpi-0.80.7/inc/commondbchild.class.php
--- glpi-0.80.5/inc/commondbchild.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/commondbchild.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/commondbrelation.class.php glpi-0.80.7/inc/commondbrelation.class.php
--- glpi-0.80.5/inc/commondbrelation.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/commondbrelation.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/commondbtm.class.php glpi-0.80.7/inc/commondbtm.class.php
--- glpi-0.80.5/inc/commondbtm.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/commondbtm.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
@@ -2426,6 +2425,16 @@
$searchOption = $this->getSearchOptionByField('field', $key);
if (isset($searchOption['datatype'])
+ && (is_null($value) || $value == '' || $value == 'NULL')) {
+
+ switch ($searchOption['datatype']) {
+ case 'date' :
+ case 'datetime' :
+ // don't use $unset', because this is not a failure
+ $this->input[$key] = 'NULL';
+ break;
+ }
+ } else if (isset($searchOption['datatype'])
&& !is_null($value)
&& $value != ''
&& $value != 'NULL') {
@@ -2616,7 +2625,12 @@
$p[$key] = $value;
}
}
-
+
+ // Do not check for template
+ if (isset($this->input['is_template']) && $this->input['is_template']) {
+ return true;
+ }
+
$result = true;
//Do not check unicity when creating infocoms or if checking is expliclty disabled
diff -Nru glpi-0.80.5/inc/commondevice.class.php glpi-0.80.7/inc/commondevice.class.php
--- glpi-0.80.5/inc/commondevice.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/commondevice.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/commondropdown.class.php glpi-0.80.7/inc/commondropdown.class.php
--- glpi-0.80.5/inc/commondropdown.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/commondropdown.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/common.function.php glpi-0.80.7/inc/common.function.php
--- glpi-0.80.5/inc/common.function.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/common.function.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
@@ -1203,13 +1202,13 @@
// Display : clean display
switch ($_SESSION['glpinumber_format']) {
case 2 : // Other French
- return str_replace(' ', ' ', number_format($number, $decimal, ', ', ' '));
+ return str_replace(' ', ' ', number_format($number, $decimal, ',', ' '));
case 0 : // French
return str_replace(' ', ' ', number_format($number, $decimal, '.', ' '));
default: // English
- return number_format($number, $decimal, '.', ', ');
+ return number_format($number, $decimal, '.', ',');
}
}
diff -Nru glpi-0.80.5/inc/commonglpi.class.php glpi-0.80.7/inc/commonglpi.class.php
--- glpi-0.80.5/inc/commonglpi.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/commonglpi.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/commontreedropdown.class.php glpi-0.80.7/inc/commontreedropdown.class.php
--- glpi-0.80.5/inc/commontreedropdown.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/commontreedropdown.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
@@ -394,7 +393,7 @@
if (isset($input['completename']) && !empty($input['completename'])) {
$query = "SELECT `id`
FROM `".$this->getTable()."`
- WHERE `completename` = '".$input['completename']."'";
+ WHERE `completename` = '".addslashes($input['completename'])."'";
if ($this->isEntityAssign()) {
$query .= getEntitiesRestrictRequest(' AND ', $this->getTable(), '',
$input['entities_id'], $this->maybeRecursive());
diff -Nru glpi-0.80.5/inc/computer.class.php glpi-0.80.7/inc/computer.class.php
--- glpi-0.80.5/inc/computer.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/computer.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/computer_device.class.php glpi-0.80.7/inc/computer_device.class.php
--- glpi-0.80.5/inc/computer_device.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/computer_device.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
@@ -239,7 +238,7 @@
if ($device->getFromDB($data[$fk])) {
echo "
";
echo "";
- Dropdown::showInteger("quantity_".$itemtype."_".$data['id'], $data['NB']);
+ Dropdown::showInteger("quantity_".$itemtype."_".$data['id'], $data['NB'],0,300);
echo " | ";
if ($device->canCreate()) {
echo "".$device->getTypeName()."";
@@ -533,8 +532,19 @@
}
}
- if (isset($this->fields['specificity'])
- && $this->fields['specificity'] == $this->input['specificity']) {
+ if ($input['_itemtype'] != 'DeviceMemory'
+ && isset($this->fields['specificity'])
+ && $this->fields['specificity'] == $this->input['specificity']) {
+ // No change
+ return false;
+ }
+
+ //For memories, type can change even if specificity not
+ if ($input['_itemtype'] == 'DeviceMemory'
+ && (isset($this->fields['specificity'])
+ && $this->fields['specificity'] == $this->input['specificity'])
+ && ((isset($this->fields['devicememories_id'])
+ && (!isset($this->input['devicememories_id']) || $this->fields['devicememories_id'] == $this->input['devicememories_id'])))) {
// No change
return false;
}
@@ -589,4 +599,4 @@
}
-?>
\ No newline at end of file
+?>
diff -Nru glpi-0.80.5/inc/computerdisk.class.php glpi-0.80.7/inc/computerdisk.class.php
--- glpi-0.80.5/inc/computerdisk.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/computerdisk.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/computer_item.class.php glpi-0.80.7/inc/computer_item.class.php
--- glpi-0.80.5/inc/computer_item.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/computer_item.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/computermodel.class.php glpi-0.80.7/inc/computermodel.class.php
--- glpi-0.80.5/inc/computermodel.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/computermodel.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/computer_softwarelicense.class.php glpi-0.80.7/inc/computer_softwarelicense.class.php
--- glpi-0.80.5/inc/computer_softwarelicense.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/computer_softwarelicense.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/computer_softwareversion.class.php glpi-0.80.7/inc/computer_softwareversion.class.php
--- glpi-0.80.5/inc/computer_softwareversion.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/computer_softwareversion.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/computertype.class.php glpi-0.80.7/inc/computertype.class.php
--- glpi-0.80.5/inc/computertype.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/computertype.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/computervirtualmachine.class.php glpi-0.80.7/inc/computervirtualmachine.class.php
--- glpi-0.80.5/inc/computervirtualmachine.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/computervirtualmachine.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/config.class.php glpi-0.80.7/inc/config.class.php
--- glpi-0.80.5/inc/config.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/config.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/consumable.class.php glpi-0.80.7/inc/consumable.class.php
--- glpi-0.80.5/inc/consumable.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/consumable.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/consumableitem.class.php glpi-0.80.7/inc/consumableitem.class.php
--- glpi-0.80.5/inc/consumableitem.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/consumableitem.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/consumableitemtype.class.php glpi-0.80.7/inc/consumableitemtype.class.php
--- glpi-0.80.5/inc/consumableitemtype.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/consumableitemtype.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/contact.class.php glpi-0.80.7/inc/contact.class.php
--- glpi-0.80.5/inc/contact.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/contact.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/contact_supplier.class.php glpi-0.80.7/inc/contact_supplier.class.php
--- glpi-0.80.5/inc/contact_supplier.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/contact_supplier.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/contacttype.class.php glpi-0.80.7/inc/contacttype.class.php
--- glpi-0.80.5/inc/contacttype.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/contacttype.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/contract.class.php glpi-0.80.7/inc/contract.class.php
--- glpi-0.80.5/inc/contract.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/contract.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
@@ -826,7 +825,9 @@
echo " | ".$LANG['entity'][0]." | ";
echo "".$LANG['common'][16]." | ";
echo "".$LANG['common'][19]." | ";
- echo "".$LANG['common'][20]." |
";
+ echo "
".$LANG['common'][20]." | ";
+ echo "
".$LANG['state'][0]." | ";
+ echo "";
$totalnb = 0;
for ($i=0 ; $i<$number ; $i++) {
@@ -904,7 +905,13 @@
(isset($data["serial"])? "".$data["serial"]."" :"-")."";
echo "
".
(isset($data["otherserial"])? "".$data["otherserial"]."" :"-")." | ";
- echo "";
+ echo "
";
+ if (isset($data["states_id"])) {
+ echo Dropdown::getDropdownName("glpi_states",$data['states_id']);
+ } else {
+ echo ' ';
+ }
+ echo " | ";
}
}
$totalnb += $nb;
diff -Nru glpi-0.80.5/inc/contract_item.class.php glpi-0.80.7/inc/contract_item.class.php
--- glpi-0.80.5/inc/contract_item.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/contract_item.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/contract_supplier.class.php glpi-0.80.7/inc/contract_supplier.class.php
--- glpi-0.80.5/inc/contract_supplier.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/contract_supplier.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/contracttype.class.php glpi-0.80.7/inc/contracttype.class.php
--- glpi-0.80.5/inc/contracttype.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/contracttype.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/crontask.class.php glpi-0.80.7/inc/crontask.class.php
--- glpi-0.80.5/inc/crontask.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/crontask.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/crontasklog.class.php glpi-0.80.7/inc/crontasklog.class.php
--- glpi-0.80.5/inc/crontasklog.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/crontasklog.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/dbconnection.class.php glpi-0.80.7/inc/dbconnection.class.php
--- glpi-0.80.5/inc/dbconnection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/dbconnection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/db.function.php glpi-0.80.7/inc/db.function.php
--- glpi-0.80.5/inc/db.function.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/db.function.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/dbmysql.class.php glpi-0.80.7/inc/dbmysql.class.php
--- glpi-0.80.5/inc/dbmysql.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/dbmysql.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/devicecase.class.php glpi-0.80.7/inc/devicecase.class.php
--- glpi-0.80.5/inc/devicecase.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/devicecase.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/devicecasetype.class.php glpi-0.80.7/inc/devicecasetype.class.php
--- glpi-0.80.5/inc/devicecasetype.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/devicecasetype.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/devicecontrol.class.php glpi-0.80.7/inc/devicecontrol.class.php
--- glpi-0.80.5/inc/devicecontrol.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/devicecontrol.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/devicedrive.class.php glpi-0.80.7/inc/devicedrive.class.php
--- glpi-0.80.5/inc/devicedrive.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/devicedrive.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/devicegraphiccard.class.php glpi-0.80.7/inc/devicegraphiccard.class.php
--- glpi-0.80.5/inc/devicegraphiccard.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/devicegraphiccard.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/deviceharddrive.class.php glpi-0.80.7/inc/deviceharddrive.class.php
--- glpi-0.80.5/inc/deviceharddrive.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/deviceharddrive.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/devicememory.class.php glpi-0.80.7/inc/devicememory.class.php
--- glpi-0.80.5/inc/devicememory.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/devicememory.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/devicememorytype.class.php glpi-0.80.7/inc/devicememorytype.class.php
--- glpi-0.80.5/inc/devicememorytype.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/devicememorytype.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/devicemotherboard.class.php glpi-0.80.7/inc/devicemotherboard.class.php
--- glpi-0.80.5/inc/devicemotherboard.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/devicemotherboard.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/devicenetworkcard.class.php glpi-0.80.7/inc/devicenetworkcard.class.php
--- glpi-0.80.5/inc/devicenetworkcard.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/devicenetworkcard.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/devicepci.class.php glpi-0.80.7/inc/devicepci.class.php
--- glpi-0.80.5/inc/devicepci.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/devicepci.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/devicepowersupply.class.php glpi-0.80.7/inc/devicepowersupply.class.php
--- glpi-0.80.5/inc/devicepowersupply.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/devicepowersupply.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/deviceprocessor.class.php glpi-0.80.7/inc/deviceprocessor.class.php
--- glpi-0.80.5/inc/deviceprocessor.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/deviceprocessor.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/devicesoundcard.class.php glpi-0.80.7/inc/devicesoundcard.class.php
--- glpi-0.80.5/inc/devicesoundcard.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/devicesoundcard.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/display.function.php glpi-0.80.7/inc/display.function.php
--- glpi-0.80.5/inc/display.function.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/display.function.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
@@ -1758,7 +1757,8 @@
// Le fil d ariane
echo "";
}
@@ -2831,8 +2831,8 @@
}
echo "
";
Dropdown::show('Entity',
- array('name' => "toimport_entities[".$tab["id"]."]
- =".$data['entities_id'],
+ array('name' => "toimport_entities[".$tab["id"]."]=".
+ $data['entities_id'],
'value' => $data['entities_id'],
'comments' => 0));
echo " | \n";
@@ -2841,8 +2841,8 @@
$data['locations_id'] = 0;
}
Dropdown::show('Location',
- array('name' => "toimport_locations[".$tab["id"]."]
- =".$data['locations_id'],
+ array('name' => "toimport_locations[".$tab["id"]."]=".
+ $data['locations_id'],
'value' => $data['locations_id'],
'comments' => 0));
echo "\n";
@@ -3723,7 +3723,7 @@
'_no_history' => !$dohistory));
self::addToOcsArray($computers_id,
array($prevalue.$devID
- > $prevalue.$network["designation"]),
+ => $prevalue.$network["designation"]),
"import_device");
}
} else {
@@ -4226,12 +4226,11 @@
glpi_header($CFG_GLPI['root_doc']."/front/ocsng.php?ocsservers_id=" . $ocs["id"]);
} else {
- echo "
\n";
+ echo "
\n";
}
}
diff -Nru glpi-0.80.5/inc/operatingsystem.class.php glpi-0.80.7/inc/operatingsystem.class.php
--- glpi-0.80.5/inc/operatingsystem.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/operatingsystem.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/operatingsystemservicepack.class.php glpi-0.80.7/inc/operatingsystemservicepack.class.php
--- glpi-0.80.5/inc/operatingsystemservicepack.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/operatingsystemservicepack.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/operatingsystemversion.class.php glpi-0.80.7/inc/operatingsystemversion.class.php
--- glpi-0.80.5/inc/operatingsystemversion.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/operatingsystemversion.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/peripheral.class.php glpi-0.80.7/inc/peripheral.class.php
--- glpi-0.80.5/inc/peripheral.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/peripheral.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/peripheralmodel.class.php glpi-0.80.7/inc/peripheralmodel.class.php
--- glpi-0.80.5/inc/peripheralmodel.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/peripheralmodel.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/peripheraltype.class.php glpi-0.80.7/inc/peripheraltype.class.php
--- glpi-0.80.5/inc/peripheraltype.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/peripheraltype.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/phone.class.php glpi-0.80.7/inc/phone.class.php
--- glpi-0.80.5/inc/phone.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/phone.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
@@ -513,6 +512,11 @@
$tab[23]['field'] = 'name';
$tab[23]['name'] = $LANG['common'][5];
+ $tab[32]['table'] = $this->getTable();
+ $tab[32]['field'] = 'firmware';
+ $tab[32]['name'] = $LANG['setup'][71];
+ $tab[32]['datatype'] = 'string';
+
$tab[24]['table'] = 'glpi_users';
$tab[24]['field'] = 'name';
$tab[24]['linkfield'] = 'users_id_tech';
diff -Nru glpi-0.80.5/inc/phonemodel.class.php glpi-0.80.7/inc/phonemodel.class.php
--- glpi-0.80.5/inc/phonemodel.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/phonemodel.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/phonepowersupply.class.php glpi-0.80.7/inc/phonepowersupply.class.php
--- glpi-0.80.5/inc/phonepowersupply.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/phonepowersupply.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/phonetype.class.php glpi-0.80.7/inc/phonetype.class.php
--- glpi-0.80.5/inc/phonetype.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/phonetype.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/planning.class.php glpi-0.80.7/inc/planning.class.php
--- glpi-0.80.5/inc/planning.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/planning.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/plugin.class.php glpi-0.80.7/inc/plugin.class.php
--- glpi-0.80.5/inc/plugin.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/plugin.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/plugin.function.php glpi-0.80.7/inc/plugin.function.php
--- glpi-0.80.5/inc/plugin.function.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/plugin.function.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
@@ -175,7 +174,7 @@
}
$function2="plugin_".$plug."_getDatabaseRelations";
if (function_exists($function2)) {
- $dps=array_merge($dps,$function2());
+ $dps=array_merge_recursive($dps,$function2());
}
}
}
diff -Nru glpi-0.80.5/inc/preference.class.php glpi-0.80.7/inc/preference.class.php
--- glpi-0.80.5/inc/preference.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/preference.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/printer.class.php glpi-0.80.7/inc/printer.class.php
--- glpi-0.80.5/inc/printer.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/printer.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/printermodel.class.php glpi-0.80.7/inc/printermodel.class.php
--- glpi-0.80.5/inc/printermodel.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/printermodel.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/printertype.class.php glpi-0.80.7/inc/printertype.class.php
--- glpi-0.80.5/inc/printertype.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/printertype.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/profile.class.php glpi-0.80.7/inc/profile.class.php
--- glpi-0.80.5/inc/profile.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/profile.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/profile_user.class.php glpi-0.80.7/inc/profile_user.class.php
--- glpi-0.80.5/inc/profile_user.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/profile_user.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
@@ -113,7 +112,8 @@
echo "";
echo "";
- Dropdown::show('Entity', array('entity' => $_SESSION['glpiactiveentities']));
+ Dropdown::show('Entity', array('entity' => $_SESSION['glpiactiveentities'],
+ 'value' => $_SESSION['glpiactive_entity']));
echo " | ".$LANG['profiles'][22]." : ";
Profile::dropdownUnder(array('value' => Profile::getDefault()));
echo " | ".$LANG['profiles'][28]." : ";
@@ -577,17 +577,23 @@
}
- static function getEntitiesForProfileByUser($users_id, $profiles_id) {
+ static function getEntitiesForProfileByUser($users_id, $profiles_id, $child=false) {
global $DB;
- $query = "SELECT `entities_id`
+ $query = "SELECT `entities_id`, `is_recursive`
FROM `glpi_profiles_users`
WHERE `users_id` = '$users_id'
AND `profiles_id` = '$profiles_id'";
$entities = array();
foreach ($DB->request($query) as $data) {
- $entities[$data['entities_id']] = $data['entities_id'];
+ if ($child && $data['is_recursive']) {
+ foreach (getSonsOf('glpi_entities', $data['entities_id']) as $id) {
+ $entities[$id] = $id;
+ }
+ } else {
+ $entities[$data['entities_id']] = $data['entities_id'];
+ }
}
return $entities;
}
diff -Nru glpi-0.80.5/inc/registrykey.class.php glpi-0.80.7/inc/registrykey.class.php
--- glpi-0.80.5/inc/registrykey.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/registrykey.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/relation.constant.php glpi-0.80.7/inc/relation.constant.php
--- glpi-0.80.5/inc/relation.constant.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/relation.constant.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/reminder.class.php glpi-0.80.7/inc/reminder.class.php
--- glpi-0.80.5/inc/reminder.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/reminder.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/requesttype.class.php glpi-0.80.7/inc/requesttype.class.php
--- glpi-0.80.5/inc/requesttype.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/requesttype.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/reservation.class.php glpi-0.80.7/inc/reservation.class.php
--- glpi-0.80.5/inc/reservation.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/reservation.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/reservationitem.class.php glpi-0.80.7/inc/reservationitem.class.php
--- glpi-0.80.5/inc/reservationitem.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/reservationitem.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruleaction.class.php glpi-0.80.7/inc/ruleaction.class.php
--- glpi-0.80.5/inc/ruleaction.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruleaction.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/rulecached.class.php glpi-0.80.7/inc/rulecached.class.php
--- glpi-0.80.5/inc/rulecached.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/rulecached.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/rulecachedcollection.class.php glpi-0.80.7/inc/rulecachedcollection.class.php
--- glpi-0.80.5/inc/rulecachedcollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/rulecachedcollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/rule.class.php glpi-0.80.7/inc/rule.class.php
--- glpi-0.80.5/inc/rule.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/rule.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
@@ -1042,18 +1041,21 @@
echo " | | ";
}
- echo "fields["id"]."&onglet=1\">" . $this->fields["name"] . " ";
+ echo " | ".$this->getLink()." ";
if (!empty($this->fields["comment"])) {
- showToolTip($this->fields["comment"], array('applyto' => "rules".$this->fields["id"]));
+ showToolTip($this->fields["comment"]);
}
echo " | ";
echo "".$this->fields["description"]." | ";
echo "".Dropdown::getYesNo($this->fields["is_active"])." | ";
if ($display_entities) {
- echo "".Dropdown::getDropdownName('glpi_entities', $this->fields['entities_id'])." | ";
+ $rec = '';
+ if ($this->maybeRecursive() && $this->fields['is_recursive']) {
+ $rec =' (R)';
+ }
+ echo "".Dropdown::getDropdownName('glpi_entities', $this->fields['entities_id'])."$rec | ";
}
if (!$display_entities) {
diff -Nru glpi-0.80.5/inc/rulecollection.class.php glpi-0.80.7/inc/rulecollection.class.php
--- glpi-0.80.5/inc/rulecollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/rulecollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/rulecriteria.class.php glpi-0.80.7/inc/rulecriteria.class.php
--- glpi-0.80.5/inc/rulecriteria.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/rulecriteria.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnarycomputermodel.class.php glpi-0.80.7/inc/ruledictionnarycomputermodel.class.php
--- glpi-0.80.5/inc/ruledictionnarycomputermodel.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnarycomputermodel.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnarycomputermodelcollection.class.php glpi-0.80.7/inc/ruledictionnarycomputermodelcollection.class.php
--- glpi-0.80.5/inc/ruledictionnarycomputermodelcollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnarycomputermodelcollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnarycomputertype.class.php glpi-0.80.7/inc/ruledictionnarycomputertype.class.php
--- glpi-0.80.5/inc/ruledictionnarycomputertype.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnarycomputertype.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnarycomputertypecollection.class.php glpi-0.80.7/inc/ruledictionnarycomputertypecollection.class.php
--- glpi-0.80.5/inc/ruledictionnarycomputertypecollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnarycomputertypecollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnarydropdown.class.php glpi-0.80.7/inc/ruledictionnarydropdown.class.php
--- glpi-0.80.5/inc/ruledictionnarydropdown.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnarydropdown.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnarydropdowncollection.class.php glpi-0.80.7/inc/ruledictionnarydropdowncollection.class.php
--- glpi-0.80.5/inc/ruledictionnarydropdowncollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnarydropdowncollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnarymanufacturer.class.php glpi-0.80.7/inc/ruledictionnarymanufacturer.class.php
--- glpi-0.80.5/inc/ruledictionnarymanufacturer.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnarymanufacturer.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnarymanufacturercollection.class.php glpi-0.80.7/inc/ruledictionnarymanufacturercollection.class.php
--- glpi-0.80.5/inc/ruledictionnarymanufacturercollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnarymanufacturercollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnarymonitormodel.class.php glpi-0.80.7/inc/ruledictionnarymonitormodel.class.php
--- glpi-0.80.5/inc/ruledictionnarymonitormodel.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnarymonitormodel.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnarymonitormodelcollection.class.php glpi-0.80.7/inc/ruledictionnarymonitormodelcollection.class.php
--- glpi-0.80.5/inc/ruledictionnarymonitormodelcollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnarymonitormodelcollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnarymonitortype.class.php glpi-0.80.7/inc/ruledictionnarymonitortype.class.php
--- glpi-0.80.5/inc/ruledictionnarymonitortype.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnarymonitortype.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnarymonitortypecollection.class.php glpi-0.80.7/inc/ruledictionnarymonitortypecollection.class.php
--- glpi-0.80.5/inc/ruledictionnarymonitortypecollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnarymonitortypecollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnarynetworkequipmentmodel.class.php glpi-0.80.7/inc/ruledictionnarynetworkequipmentmodel.class.php
--- glpi-0.80.5/inc/ruledictionnarynetworkequipmentmodel.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnarynetworkequipmentmodel.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnarynetworkequipmentmodelcollection.class.php glpi-0.80.7/inc/ruledictionnarynetworkequipmentmodelcollection.class.php
--- glpi-0.80.5/inc/ruledictionnarynetworkequipmentmodelcollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnarynetworkequipmentmodelcollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnarynetworkequipmenttype.class.php glpi-0.80.7/inc/ruledictionnarynetworkequipmenttype.class.php
--- glpi-0.80.5/inc/ruledictionnarynetworkequipmenttype.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnarynetworkequipmenttype.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnarynetworkequipmenttypecollection.class.php glpi-0.80.7/inc/ruledictionnarynetworkequipmenttypecollection.class.php
--- glpi-0.80.5/inc/ruledictionnarynetworkequipmenttypecollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnarynetworkequipmenttypecollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnaryoperatingsystem.class.php glpi-0.80.7/inc/ruledictionnaryoperatingsystem.class.php
--- glpi-0.80.5/inc/ruledictionnaryoperatingsystem.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnaryoperatingsystem.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnaryoperatingsystemcollection.class.php glpi-0.80.7/inc/ruledictionnaryoperatingsystemcollection.class.php
--- glpi-0.80.5/inc/ruledictionnaryoperatingsystemcollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnaryoperatingsystemcollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnaryoperatingsystemservicepack.class.php glpi-0.80.7/inc/ruledictionnaryoperatingsystemservicepack.class.php
--- glpi-0.80.5/inc/ruledictionnaryoperatingsystemservicepack.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnaryoperatingsystemservicepack.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnaryoperatingsystemservicepackcollection.class.php glpi-0.80.7/inc/ruledictionnaryoperatingsystemservicepackcollection.class.php
--- glpi-0.80.5/inc/ruledictionnaryoperatingsystemservicepackcollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnaryoperatingsystemservicepackcollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnaryoperatingsystemversion.class.php glpi-0.80.7/inc/ruledictionnaryoperatingsystemversion.class.php
--- glpi-0.80.5/inc/ruledictionnaryoperatingsystemversion.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnaryoperatingsystemversion.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnaryoperatingsystemversioncollection.class.php glpi-0.80.7/inc/ruledictionnaryoperatingsystemversioncollection.class.php
--- glpi-0.80.5/inc/ruledictionnaryoperatingsystemversioncollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnaryoperatingsystemversioncollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnaryperipheralmodel.class.php glpi-0.80.7/inc/ruledictionnaryperipheralmodel.class.php
--- glpi-0.80.5/inc/ruledictionnaryperipheralmodel.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnaryperipheralmodel.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnaryperipheralmodelcollection.class.php glpi-0.80.7/inc/ruledictionnaryperipheralmodelcollection.class.php
--- glpi-0.80.5/inc/ruledictionnaryperipheralmodelcollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnaryperipheralmodelcollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnaryperipheraltype.class.php glpi-0.80.7/inc/ruledictionnaryperipheraltype.class.php
--- glpi-0.80.5/inc/ruledictionnaryperipheraltype.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnaryperipheraltype.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnaryperipheraltypecollection.class.php glpi-0.80.7/inc/ruledictionnaryperipheraltypecollection.class.php
--- glpi-0.80.5/inc/ruledictionnaryperipheraltypecollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnaryperipheraltypecollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnaryphonemodel.class.php glpi-0.80.7/inc/ruledictionnaryphonemodel.class.php
--- glpi-0.80.5/inc/ruledictionnaryphonemodel.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnaryphonemodel.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnaryphonemodelcollection.class.php glpi-0.80.7/inc/ruledictionnaryphonemodelcollection.class.php
--- glpi-0.80.5/inc/ruledictionnaryphonemodelcollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnaryphonemodelcollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnaryphonetype.class.php glpi-0.80.7/inc/ruledictionnaryphonetype.class.php
--- glpi-0.80.5/inc/ruledictionnaryphonetype.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnaryphonetype.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnaryphonetypecollection.class.php glpi-0.80.7/inc/ruledictionnaryphonetypecollection.class.php
--- glpi-0.80.5/inc/ruledictionnaryphonetypecollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnaryphonetypecollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnaryprinter.class.php glpi-0.80.7/inc/ruledictionnaryprinter.class.php
--- glpi-0.80.5/inc/ruledictionnaryprinter.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnaryprinter.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -2,10 +2,10 @@
/*
- * @version $Id: ruledictionnaryprinter.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryprinter.class.php 17154 2012-01-24 11:27:36Z moyo $
-------------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2003-2011 by the INDEPNET Development Team.
+ Copyright (C) 2003-2012 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi-project.org
-------------------------------------------------------------------------
@@ -25,8 +25,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with GLPI; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ along with GLPI. If not, see .
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnaryprintercollection.class.php glpi-0.80.7/inc/ruledictionnaryprintercollection.class.php
--- glpi-0.80.5/inc/ruledictionnaryprintercollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnaryprintercollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -2,10 +2,10 @@
/*
- * @version $Id: ruledictionnaryprintercollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryprintercollection.class.php 17154 2012-01-24 11:27:36Z moyo $
-------------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2003-2011 by the INDEPNET Development Team.
+ Copyright (C) 2003-2012 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi-project.org
-------------------------------------------------------------------------
@@ -25,8 +25,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with GLPI; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ along with GLPI. If not, see .
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnaryprintermodel.class.php glpi-0.80.7/inc/ruledictionnaryprintermodel.class.php
--- glpi-0.80.5/inc/ruledictionnaryprintermodel.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnaryprintermodel.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnaryprintermodelcollection.class.php glpi-0.80.7/inc/ruledictionnaryprintermodelcollection.class.php
--- glpi-0.80.5/inc/ruledictionnaryprintermodelcollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnaryprintermodelcollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnaryprintertype.class.php glpi-0.80.7/inc/ruledictionnaryprintertype.class.php
--- glpi-0.80.5/inc/ruledictionnaryprintertype.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnaryprintertype.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnaryprintertypecollection.class.php glpi-0.80.7/inc/ruledictionnaryprintertypecollection.class.php
--- glpi-0.80.5/inc/ruledictionnaryprintertypecollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnaryprintertypecollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnarysoftware.class.php glpi-0.80.7/inc/ruledictionnarysoftware.class.php
--- glpi-0.80.5/inc/ruledictionnarysoftware.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnarysoftware.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -2,10 +2,10 @@
/*
- * @version $Id: ruledictionnarysoftware.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarysoftware.class.php 17154 2012-01-24 11:27:36Z moyo $
-------------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2003-2011 by the INDEPNET Development Team.
+ Copyright (C) 2003-2012 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi-project.org
-------------------------------------------------------------------------
@@ -25,8 +25,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with GLPI; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ along with GLPI. If not, see .
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruledictionnarysoftwarecollection.class.php glpi-0.80.7/inc/ruledictionnarysoftwarecollection.class.php
--- glpi-0.80.5/inc/ruledictionnarysoftwarecollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruledictionnarysoftwarecollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -2,10 +2,10 @@
/*
- * @version $Id: ruledictionnarysoftwarecollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarysoftwarecollection.class.php 17154 2012-01-24 11:27:36Z moyo $
-------------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2003-2011 by the INDEPNET Development Team.
+ Copyright (C) 2003-2012 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi-project.org
-------------------------------------------------------------------------
@@ -25,8 +25,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with GLPI; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ along with GLPI. If not, see .
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruleimportcomputer.class.php glpi-0.80.7/inc/ruleimportcomputer.class.php
--- glpi-0.80.5/inc/ruleimportcomputer.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruleimportcomputer.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruleimportcomputercollection.class.php glpi-0.80.7/inc/ruleimportcomputercollection.class.php
--- glpi-0.80.5/inc/ruleimportcomputercollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruleimportcomputercollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/rulemailcollector.class.php glpi-0.80.7/inc/rulemailcollector.class.php
--- glpi-0.80.5/inc/rulemailcollector.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/rulemailcollector.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
@@ -258,6 +257,7 @@
if ($profile) {
$entities = array();
if (isset($params['_users_id_requester'])) { // Not set when testing
+ // Retrieve only the "top" entities
$entities = Profile_User::getEntitiesForProfileByUser($params['_users_id_requester'],
$profile);
}
@@ -279,9 +279,16 @@
$user = new User;
$user->getFromDB($params['_users_id_requester']);
- //If an entity is defined in user's preferences, use this one
- //else do not set the rule as matched
- if (is_integer($user->getField('entities_id'))) {
+ $tmpid = $user->getField('entities_id');
+
+ // Retrieve all the entities (pref could be set on a child)
+ $entities = Profile_User::getEntitiesForProfileByUser($params['_users_id_requester'],
+ $profile, true);
+
+ // If an entity is defined in user's preferences,
+ // and this entity allowed for this profile, use this one
+ // else do not set the rule as matched
+ if (in_array($tmpid, $entities)) {
$output['entities_id'] = $user->fields['entities_id'];
}
}
diff -Nru glpi-0.80.5/inc/rulemailcollectorcollection.class.php glpi-0.80.7/inc/rulemailcollectorcollection.class.php
--- glpi-0.80.5/inc/rulemailcollectorcollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/rulemailcollectorcollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruleocs.class.php glpi-0.80.7/inc/ruleocs.class.php
--- glpi-0.80.5/inc/ruleocs.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruleocs.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruleocscollection.class.php glpi-0.80.7/inc/ruleocscollection.class.php
--- glpi-0.80.5/inc/ruleocscollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruleocscollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruleright.class.php glpi-0.80.7/inc/ruleright.class.php
--- glpi-0.80.5/inc/ruleright.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruleright.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/rulerightcollection.class.php glpi-0.80.7/inc/rulerightcollection.class.php
--- glpi-0.80.5/inc/rulerightcollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/rulerightcollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/rulerightparameter.class.php glpi-0.80.7/inc/rulerightparameter.class.php
--- glpi-0.80.5/inc/rulerightparameter.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/rulerightparameter.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/rulesoftwarecategory.class.php glpi-0.80.7/inc/rulesoftwarecategory.class.php
--- glpi-0.80.5/inc/rulesoftwarecategory.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/rulesoftwarecategory.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/rulesoftwarecategorycollection.class.php glpi-0.80.7/inc/rulesoftwarecategorycollection.class.php
--- glpi-0.80.5/inc/rulesoftwarecategorycollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/rulesoftwarecategorycollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruleticket.class.php glpi-0.80.7/inc/ruleticket.class.php
--- glpi-0.80.5/inc/ruleticket.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruleticket.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ruleticketcollection.class.php glpi-0.80.7/inc/ruleticketcollection.class.php
--- glpi-0.80.5/inc/ruleticketcollection.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ruleticketcollection.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/search.class.php glpi-0.80.7/inc/search.class.php
--- glpi-0.80.5/inc/search.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/search.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
@@ -2088,13 +2087,13 @@
case "glpi_groups.name" :
if ($itemtype != 'Group' && $itemtype != 'User') {
-
+
if ($meta
|| (isset($searchopt[$ID]["forcegroupby"]) && $searchopt[$ID]["forcegroupby"])) {
return " GROUP_CONCAT(DISTINCT `$table$addtable`.`$field` SEPARATOR '$$$$') AS ".$NAME."_$num, ";
}
return "`$table$addtable`.`$field` AS ".$NAME."_$num, ";
-
+
// return " `$table$addtable`.`$field` AS ".$NAME."_$num, ";
}
break;
@@ -2574,7 +2573,18 @@
return " $link (`$table`.`id`".$SEARCH.
($val==0?" OR `$table`.`id` IS NULL":'').') ';
}
- return $link." (`$table`.`$name1` $SEARCH
+
+ $toadd = '';
+ if ($itemtype == 'Ticket') {
+ if (isset($searchopt[$ID]["joinparams"]["beforejoin"]["table"])
+ && isset($searchopt[$ID]["joinparams"]["beforejoin"]["joinparams"])) {
+ $bj = $searchopt[$ID]["joinparams"]["beforejoin"];
+ $linktable = $bj['table'].'_'.self::computeComplexJoinID($bj['joinparams']);
+ $toadd = "`$linktable`.`alternative_email` $SEARCH OR ";
+ }
+ }
+
+ return $link." ($toadd `$table`.`$name1` $SEARCH
OR `$table`.`$name2` $SEARCH
OR CONCAT(`$table`.`$name1`, ' ',
`$table`.`$name2`) $SEARCH".
@@ -2592,7 +2602,7 @@
// return " $link (`$table`.`id` IS NOT NULL) ";
// }
// return " $link (`$table`.`id`".$SEARCH.') ';
-//
+//
// }
// return makeTextCriteria("`$table`.`$field`", $val, $nott, $link);
@@ -2944,7 +2954,7 @@
if ($searchtype=='notequals') {
$nott = !$nott;
}
- // Add NULL if $val = 0 and not negative search or
+ // Add NULL if $val = 0 and not negative search or
// Or negative search on real value
if ((!$nott && $val==0) || ($nott && $val != 0)) {
$out .= " OR `$table`.`id` IS NULL";
@@ -3919,7 +3929,9 @@
$item = NotificationTarget::getInstanceByType($data['itemtype']);
if ($item) {
$events = $item->getAllEvents();
- return $events[$data[$NAME.$num]];
+ if (isset($events[$data[$NAME.$num]])) {
+ return $events[$data[$NAME.$num]];
+ }
}
return '';
@@ -4572,6 +4584,7 @@
$search['States'][24]['table'] = 'glpi_users';
$search['States'][24]['field'] = 'name';
+ $search['States'][24]['linkfield'] = 'users_id_tech';
$search['States'][24]['name'] = $LANG['common'][10];
$search['States'][80]['table'] = 'glpi_entities';
@@ -4628,6 +4641,10 @@
$itemtable = $item->getTable();
}
foreach ($search[$itemtype] as $key => $val) {
+ if (!is_array($val)) {
+ // skip sub-menu
+ continue;
+ }
// Compatibility before 0.80 : Force massive action to false if linkfield is empty :
if (isset($val['linkfield']) && empty($val['linkfield'])) {
$search[$itemtype][$key]['massiveaction'] = false;
diff -Nru glpi-0.80.5/inc/setup.function.php glpi-0.80.7/inc/setup.function.php
--- glpi-0.80.5/inc/setup.function.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/setup.function.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/singletonrulelist.class.php glpi-0.80.7/inc/singletonrulelist.class.php
--- glpi-0.80.5/inc/singletonrulelist.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/singletonrulelist.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/sla.class.php glpi-0.80.7/inc/sla.class.php
--- glpi-0.80.5/inc/sla.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/sla.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/slalevelaction.class.php glpi-0.80.7/inc/slalevelaction.class.php
--- glpi-0.80.5/inc/slalevelaction.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/slalevelaction.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/slalevel.class.php glpi-0.80.7/inc/slalevel.class.php
--- glpi-0.80.5/inc/slalevel.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/slalevel.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/slalevel_ticket.class.php glpi-0.80.7/inc/slalevel_ticket.class.php
--- glpi-0.80.5/inc/slalevel_ticket.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/slalevel_ticket.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/softwarecategory.class.php glpi-0.80.7/inc/softwarecategory.class.php
--- glpi-0.80.5/inc/softwarecategory.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/softwarecategory.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/software.class.php glpi-0.80.7/inc/software.class.php
--- glpi-0.80.5/inc/software.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/software.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -2,10 +2,10 @@
/*
- * @version $Id: software.class.php 14722 2011-06-21 08:49:32Z moyo $
+ * @version $Id: software.class.php 17154 2012-01-24 11:27:36Z moyo $
-------------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2003-2011 by the INDEPNET Development Team.
+ Copyright (C) 2003-2012 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi-project.org
-------------------------------------------------------------------------
@@ -25,8 +25,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with GLPI; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ along with GLPI. If not, see .
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/softwarelicense.class.php glpi-0.80.7/inc/softwarelicense.class.php
--- glpi-0.80.5/inc/softwarelicense.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/softwarelicense.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -2,10 +2,10 @@
/*
- * @version $Id: softwarelicense.class.php 15912 2011-10-25 06:28:00Z moyo $
+ * @version $Id: softwarelicense.class.php 17154 2012-01-24 11:27:36Z moyo $
-------------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2003-2011 by the INDEPNET Development Team.
+ Copyright (C) 2003-2012 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi-project.org
-------------------------------------------------------------------------
@@ -25,8 +25,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with GLPI; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ along with GLPI. If not, see .
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/softwarelicensetype.class.php glpi-0.80.7/inc/softwarelicensetype.class.php
--- glpi-0.80.5/inc/softwarelicensetype.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/softwarelicensetype.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/softwareversion.class.php glpi-0.80.7/inc/softwareversion.class.php
--- glpi-0.80.5/inc/softwareversion.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/softwareversion.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -2,10 +2,10 @@
/*
- * @version $Id: softwareversion.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: softwareversion.class.php 17154 2012-01-24 11:27:36Z moyo $
-------------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2003-2011 by the INDEPNET Development Team.
+ Copyright (C) 2003-2012 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi-project.org
-------------------------------------------------------------------------
@@ -25,8 +25,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with GLPI; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ along with GLPI. If not, see .
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/stat.class.php glpi-0.80.7/inc/stat.class.php
--- glpi-0.80.5/inc/stat.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/stat.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/state.class.php glpi-0.80.7/inc/state.class.php
--- glpi-0.80.5/inc/state.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/state.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/supplier.class.php glpi-0.80.7/inc/supplier.class.php
--- glpi-0.80.5/inc/supplier.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/supplier.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/suppliertype.class.php glpi-0.80.7/inc/suppliertype.class.php
--- glpi-0.80.5/inc/suppliertype.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/suppliertype.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/taskcategory.class.php glpi-0.80.7/inc/taskcategory.class.php
--- glpi-0.80.5/inc/taskcategory.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/taskcategory.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ticketcategory.class.php glpi-0.80.7/inc/ticketcategory.class.php
--- glpi-0.80.5/inc/ticketcategory.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ticketcategory.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
@@ -89,10 +88,10 @@
$tab[71]['field'] = 'name';
$tab[71]['name'] = $LANG['common'][35];
- $tab[2]['table'] = $this->getTable();
- $tab[2]['field'] = 'is_helpdeskvisible';
- $tab[2]['name'] = $LANG['tracking'][39];
- $tab[2]['datatype'] = 'bool';
+ $tab[3]['table'] = $this->getTable();
+ $tab[3]['field'] = 'is_helpdeskvisible';
+ $tab[3]['name'] = $LANG['tracking'][39];
+ $tab[3]['datatype'] = 'bool';
return $tab;
}
@@ -149,4 +148,4 @@
}
}
-?>
\ No newline at end of file
+?>
diff -Nru glpi-0.80.5/inc/ticket.class.php glpi-0.80.7/inc/ticket.class.php
--- glpi-0.80.5/inc/ticket.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ticket.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
@@ -706,7 +705,7 @@
&& $input['_ticket_requester']['alternative_email'])
|| $input['_ticket_requester']['users_id']>0) {
$ticket_user = new Ticket_User();
- if ($ticket_user->can(-1,'w',$input['_ticket_requester'])) {
+ if (isset($input['_auto_update']) || $ticket_user->can(-1,'w',$input['_ticket_requester'])) {
$ticket_user->add($input['_ticket_requester']);
$input['_forcenotif'] = true;
}
@@ -715,7 +714,7 @@
case "group" :
$group_ticket = new Group_Ticket();
- if ($group_ticket->can(-1,'w',$input['_ticket_requester'])) {
+ if (isset($input['_auto_update']) || $group_ticket->can(-1,'w',$input['_ticket_requester'])) {
$group_ticket->add($input['_ticket_requester']);
$input['_forcenotif'] = true;
}
@@ -742,7 +741,7 @@
&& $input['_ticket_observer']['alternative_email'])
|| $input['_ticket_observer']['users_id']>0) {
$ticket_user = new Ticket_User();
- if ($ticket_user->can(-1,'w',$input['_ticket_observer'])) {
+ if (isset($input['_auto_update']) || $ticket_user->can(-1,'w',$input['_ticket_observer'])) {
$ticket_user->add($input['_ticket_observer']);
$input['_forcenotif'] = true;
}
@@ -751,7 +750,7 @@
case "group" :
$group_ticket = new Group_Ticket();
- if ($group_ticket->can(-1,'w',$input['_ticket_observer'])) {
+ if (isset($input['_auto_update']) || $group_ticket->can(-1,'w',$input['_ticket_observer'])) {
$group_ticket->add($input['_ticket_observer']);
$input['_forcenotif'] = true;
}
@@ -768,7 +767,7 @@
switch ($input['_ticket_assign']['_type']) {
case "user" :
$ticket_user = new Ticket_User();
- if ($ticket_user->can(-1,'w',$input['_ticket_assign'])) {
+ if (isset($input['_auto_update']) || $ticket_user->can(-1,'w',$input['_ticket_assign'])) {
$ticket_user->add($input['_ticket_assign']);
$input['_forcenotif'] = true;
if ((!isset($input['status']) && $this->fields['status']=='new')
@@ -780,7 +779,7 @@
case "group" :
$group_ticket = new Group_Ticket();
- if ($group_ticket->can(-1,'w',$input['_ticket_assign'])) {
+ if (isset($input['_auto_update']) || $group_ticket->can(-1,'w',$input['_ticket_assign'])) {
$group_ticket->add($input['_ticket_assign']);
$input['_forcenotif'] = true;
if ((!isset($input['status']) && $this->fields['status']=='new')
@@ -862,7 +861,9 @@
$values['_auto_update'] = true;
}
- if ($validation->can(-1, 'w', $values)) {
+ if (!is_numeric(getLoginUserID(false))
+ || $validation->can(-1, 'w', $values)) {
+
$validation->add($values);
Event::log($this->fields['id'], "ticket", 4, "tracking",
@@ -1593,7 +1594,7 @@
if (empty($input["name"])) {
$input["name"] = preg_replace('/\r\n/',' ',$input['content']);
$input["name"] = preg_replace('/\n/',' ',$input['name']);
- $input["name"] = utf8_substr($input['name'],0,70);
+ $input["name"] = addslashes(utf8_substr(stripslashes($input['name']),0,70));
}
//// Manage SLA assignment
@@ -3266,7 +3267,7 @@
}
$query .= getEntitiesRestrictRequest("AND",$itemtable,"",$entity_restrict,
- $item->maybeRecursive()) ;"
+ $item->maybeRecursive())."
ORDER BY `name` ";
$result = $DB->query($query);
@@ -4277,7 +4278,7 @@
echo "".$LANG['joblist'][11]." : | ";
echo "";
$date = $this->fields["date"];
-
+
if ($canupdate) {
showDateTimeFormItem("date", $date, 1, false);
} else {
@@ -5290,7 +5291,7 @@
$order = '';
$options['reset'] = 'reset';
- if ($itemtype == 'Sla') {
+ if ($itemtype == 'SLA') {
$restrict = "(`slas_id` = '$items_id')";
$order = '`glpi_tickets`.`due_date` DESC';
$options['field'][0] = 30;
@@ -6579,8 +6580,9 @@
$nb = 0;
foreach ($DB->request($query) as $tick) {
- $ticket->update(array('id' => $tick['id'],
- 'status' => 'closed'));
+ $ticket->update(array('id' => $tick['id'],
+ 'status' => 'closed',
+ '_auto_update' => true));
$nb++;
}
diff -Nru glpi-0.80.5/inc/ticketfollowup.class.php glpi-0.80.7/inc/ticketfollowup.class.php
--- glpi-0.80.5/inc/ticketfollowup.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ticketfollowup.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
@@ -196,7 +195,9 @@
Log::history($this->getField('tickets_id'), 'Ticket', $changes, $this->getType(),
HISTORY_DELETE_SUBITEM);
- $options = array('followup_id' => $this->fields["id"]);
+ $options = array('followup_id' => $this->fields["id"],
+ // Force is_private with data / not available
+ 'is_private' => $this->fields['is_private']);
NotificationEvent::raiseEvent('delete_followup', $job, $options);
}
@@ -223,7 +224,8 @@
if ($CFG_GLPI["use_mailing"]
&& (in_array("content",$this->updates)
|| isset($this->input['_need_send_mail']))) {
- $options = array('followup_id' => $this->fields["id"]);
+ $options = array('followup_id' => $this->fields["id"],
+ 'is_private' => $this->fields["is_private"]);
NotificationEvent::raiseEvent("update_followup", $job, $options);
}
@@ -341,7 +343,8 @@
}
if ($donotif) {
- $options = array('followup_id' => $this->fields["id"]);
+ $options = array('followup_id' => $this->fields["id"],
+ 'is_private' => $this->fields["is_private"]);
NotificationEvent::raiseEvent("add_followup", $this->input["_job"], $options);
}
diff -Nru glpi-0.80.5/inc/ticketplanning.class.php glpi-0.80.7/inc/ticketplanning.class.php
--- glpi-0.80.5/inc/ticketplanning.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ticketplanning.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ticketsatisfaction.class.php glpi-0.80.7/inc/ticketsatisfaction.class.php
--- glpi-0.80.5/inc/ticketsatisfaction.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ticketsatisfaction.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ticketsolutiontemplate.class.php glpi-0.80.7/inc/ticketsolutiontemplate.class.php
--- glpi-0.80.5/inc/ticketsolutiontemplate.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ticketsolutiontemplate.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ticketsolutiontype.class.php glpi-0.80.7/inc/ticketsolutiontype.class.php
--- glpi-0.80.5/inc/ticketsolutiontype.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ticketsolutiontype.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/tickettask.class.php glpi-0.80.7/inc/tickettask.class.php
--- glpi-0.80.5/inc/tickettask.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/tickettask.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
@@ -178,7 +177,9 @@
Log::history($this->getField('tickets_id'), 'Ticket', $changes, $this->getType(),
HISTORY_DELETE_SUBITEM);
- $options = array('task_id' => $this->fields["id"]);
+ $options = array('task_id' => $this->fields["id"],
+ // Force is_private with data / not available
+ 'is_private' => $this->fields['is_private']);
NotificationEvent::raiseEvent('delete_task', $job, $options);
}
@@ -209,14 +210,15 @@
$job = new Ticket;
$mailsend = false;
- if ($job->getFromDB($this->input["tickets_id"])) {
- $job->updateDateMod($this->input["tickets_id"]);
+ if ($job->getFromDB($this->fields["tickets_id"])) {
+ $job->updateDateMod($this->fields["tickets_id"]);
if (count($this->updates)) {
$update_done = true;
if ($CFG_GLPI["use_mailing"] && (in_array("content",$this->updates))) {
- $options = array('task_id' => $this->fields["id"]);
+ $options = array('task_id' => $this->fields["id"],
+ 'is_private' => $this->fields['is_private']);
NotificationEvent::raiseEvent('update_task', $job, $options);
$mailsend = true;
}
@@ -356,7 +358,8 @@
}
if ($donotif) {
- $options = array('task_id' => $this->fields["id"]);
+ $options = array('task_id' => $this->fields["id"],
+ 'is_private' => $this->fields['is_private']);
NotificationEvent::raiseEvent('add_task', $this->input["_job"], $options);
}
diff -Nru glpi-0.80.5/inc/ticket_ticket.class.php glpi-0.80.7/inc/ticket_ticket.class.php
--- glpi-0.80.5/inc/ticket_ticket.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ticket_ticket.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ticket_user.class.php glpi-0.80.7/inc/ticket_user.class.php
--- glpi-0.80.5/inc/ticket_user.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ticket_user.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/ticketvalidation.class.php glpi-0.80.7/inc/ticketvalidation.class.php
--- glpi-0.80.5/inc/ticketvalidation.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ticketvalidation.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/timer.class.php glpi-0.80.7/inc/timer.class.php
--- glpi-0.80.5/inc/timer.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/timer.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/transfer.class.php glpi-0.80.7/inc/transfer.class.php
--- glpi-0.80.5/inc/transfer.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/transfer.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/usercategory.class.php glpi-0.80.7/inc/usercategory.class.php
--- glpi-0.80.5/inc/usercategory.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/usercategory.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
.
--------------------------------------------------------------------------
*/
diff -Nru glpi-0.80.5/inc/user.class.php glpi-0.80.7/inc/user.class.php
--- glpi-0.80.5/inc/user.class.php 2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/user.class.php 2012-02-09 20:24:11.000000000 +0000
@@ -2,10 +2,10 @@
/*
- * @version $Id: user.class.php 15740 2011-09-22 11:02:07Z remi $
+ * @version $Id: user.class.php 17154 2012-01-24 11:27:36Z moyo $
-------------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2003-2011 by the INDEPNET Development Team.
+ Copyright (C) 2003-2012 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi-project.org
-------------------------------------------------------------------------
@@ -25,8 +25,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with GLPI; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ along with GLPI. If not, see .
--------------------------------------------------------------------------
*/
@@ -1071,7 +1070,9 @@
$listgroups = array();
//User dn may contain ( or ), need to espace it!
- $user_dn = str_replace(array("(", ")"), array("\(", "\)"), $user_dn);
+ //User dn may also contains \, which must be replaced by \\, ...
+ //$user_dn = addslashes($user_dn);
+ $user_dn = str_replace(array("(", ")", "\,", "\+"), array("\(", "\)", "\\\,", "\\\+"), $user_dn);
//Only retrive cn and member attributes from groups
$attrs = array('dn');
@@ -1088,6 +1089,7 @@
//Get the result of the search as an array
$info = ldap_get_entries_clean($ds, $sr);
+
//Browse all the groups
for ($i = 0 ; $i < count($info) ; $i++) {
//Get the cn of the group and add it to the list of groups
@@ -1615,10 +1617,10 @@
$result = $DB->query($query);
if ($DB->numrows($result) > 0) {
+ /// To display a message
+ $this->fields['name'] = $this->oldvalues['name'];
unset($this->updates[$key]);
unset($this->oldvalues['name']);
- /// For displayed message
- $this->fields['name'] = $this->oldvalues['name'];
addMessageAfterRedirect($LANG['setup'][614], false, ERROR);
}
}
@@ -1806,6 +1808,7 @@
$tab[23]['table'] = $this->getTable();
$tab[23]['field'] = 'date_sync';
+ $tab[23]['datatype'] = 'datetime';
$tab[23]['name'] = $LANG['login'][29];
$tab[23]['massiveaction'] = false;
@@ -2227,7 +2230,8 @@
`glpi_groups`.`name`
FROM `glpi_groups_users`
LEFT JOIN `glpi_groups` ON (`glpi_groups`.`id` = `glpi_groups_users`.`groups_id`)
- WHERE `glpi_groups_users`.`users_id` = '$ID'";
+ WHERE `glpi_groups_users`.`users_id` = '$ID'
+ AND `glpi_groups_users`.`groups_id` > 0";
$result = $DB->query($query);
$number = $DB->numrows($result);
@@ -2252,6 +2256,7 @@
echo " | ".$LANG['common'][16]." | ";
echo "".$LANG['common'][19]." | ";
echo "".$LANG['common'][20]." | ";
+ echo "".$LANG['state'][0]." | ";
echo " |
";
foreach ($CFG_GLPI["linkuser_types"] as $itemtype) {
@@ -2305,7 +2310,13 @@
} else {
echo ' ';
}
- echo "