diff -Nru glpi-0.80.5/ajax/authldap.tabs.php glpi-0.80.7/ajax/authldap.tabs.php
--- glpi-0.80.5/ajax/authldap.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/authldap.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: authldap.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: authldap.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/authmail.tabs.php glpi-0.80.7/ajax/authmail.tabs.php
--- glpi-0.80.5/ajax/authmail.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/authmail.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: authmail.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: authmail.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/autocompletion.php glpi-0.80.7/ajax/autocompletion.php
--- glpi-0.80.5/ajax/autocompletion.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/autocompletion.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: autocompletion.php 14958 2011-07-20 09:29:18Z moyo $
+ * @version $Id: autocompletion.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/autoupdatesystem.tabs.php glpi-0.80.7/ajax/autoupdatesystem.tabs.php
--- glpi-0.80.5/ajax/autoupdatesystem.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/autoupdatesystem.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: autoupdatesystem.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: autoupdatesystem.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/bookmark.tabs.php glpi-0.80.7/ajax/bookmark.tabs.php
--- glpi-0.80.5/ajax/bookmark.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/bookmark.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: bookmark.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: bookmark.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/budget.tabs.php glpi-0.80.7/ajax/budget.tabs.php
--- glpi-0.80.5/ajax/budget.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/budget.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: budget.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: budget.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/calendar.tabs.php glpi-0.80.7/ajax/calendar.tabs.php
--- glpi-0.80.5/ajax/calendar.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/calendar.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: calendar.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: calendar.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/cartridgeitem.tabs.php glpi-0.80.7/ajax/cartridgeitem.tabs.php
--- glpi-0.80.5/ajax/cartridgeitem.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/cartridgeitem.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: cartridgeitem.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: cartridgeitem.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/cartridgeitemtype.tabs.php glpi-0.80.7/ajax/cartridgeitemtype.tabs.php
--- glpi-0.80.5/ajax/cartridgeitemtype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/cartridgeitemtype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: cartridgeitemtype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: cartridgeitemtype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/central.tabs.php glpi-0.80.7/ajax/central.tabs.php
--- glpi-0.80.5/ajax/central.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/central.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: central.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: central.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/comments.php glpi-0.80.7/ajax/comments.php
--- glpi-0.80.5/ajax/comments.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/comments.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: comments.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: comments.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/computerdisk.tabs.php glpi-0.80.7/ajax/computerdisk.tabs.php
--- glpi-0.80.5/ajax/computerdisk.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/computerdisk.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: computerdisk.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: computerdisk.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/computermodel.tabs.php glpi-0.80.7/ajax/computermodel.tabs.php
--- glpi-0.80.5/ajax/computermodel.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/computermodel.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: computermodel.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: computermodel.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/computer.tabs.php glpi-0.80.7/ajax/computer.tabs.php
--- glpi-0.80.5/ajax/computer.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/computer.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: computer.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: computer.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/computertype.tabs.php glpi-0.80.7/ajax/computertype.tabs.php
--- glpi-0.80.5/ajax/computertype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/computertype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: computertype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: computertype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/computervirtualmachine.tabs.php glpi-0.80.7/ajax/computervirtualmachine.tabs.php
--- glpi-0.80.5/ajax/computervirtualmachine.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/computervirtualmachine.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: computervirtualmachine.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: computervirtualmachine.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/config.tabs.php glpi-0.80.7/ajax/config.tabs.php
--- glpi-0.80.5/ajax/config.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/config.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: config.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: config.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/consumableitem.tabs.php glpi-0.80.7/ajax/consumableitem.tabs.php
--- glpi-0.80.5/ajax/consumableitem.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/consumableitem.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: consumableitem.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: consumableitem.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/consumableitemtype.tabs.php glpi-0.80.7/ajax/consumableitemtype.tabs.php
--- glpi-0.80.5/ajax/consumableitemtype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/consumableitemtype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: consumableitemtype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: consumableitemtype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/contact.tabs.php glpi-0.80.7/ajax/contact.tabs.php
--- glpi-0.80.5/ajax/contact.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/contact.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: contact.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: contact.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/contacttype.tabs.php glpi-0.80.7/ajax/contacttype.tabs.php
--- glpi-0.80.5/ajax/contacttype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/contacttype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: contacttype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: contacttype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/contract.tabs.php glpi-0.80.7/ajax/contract.tabs.php
--- glpi-0.80.5/ajax/contract.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/contract.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: contract.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: contract.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/contracttype.tabs.php glpi-0.80.7/ajax/contracttype.tabs.php
--- glpi-0.80.5/ajax/contracttype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/contracttype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: contracttype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: contracttype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/crontask.tabs.php glpi-0.80.7/ajax/crontask.tabs.php
--- glpi-0.80.5/ajax/crontask.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/crontask.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: crontask.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: crontask.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/devicecase.tabs.php glpi-0.80.7/ajax/devicecase.tabs.php
--- glpi-0.80.5/ajax/devicecase.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/devicecase.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicecase.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicecase.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/devicecasetype.tabs.php glpi-0.80.7/ajax/devicecasetype.tabs.php
--- glpi-0.80.5/ajax/devicecasetype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/devicecasetype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicecasetype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicecasetype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/devicecontrol.tabs.php glpi-0.80.7/ajax/devicecontrol.tabs.php
--- glpi-0.80.5/ajax/devicecontrol.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/devicecontrol.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicecontrol.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicecontrol.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/devicedrive.tabs.php glpi-0.80.7/ajax/devicedrive.tabs.php
--- glpi-0.80.5/ajax/devicedrive.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/devicedrive.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicedrive.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicedrive.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/devicegraphiccard.tabs.php glpi-0.80.7/ajax/devicegraphiccard.tabs.php
--- glpi-0.80.5/ajax/devicegraphiccard.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/devicegraphiccard.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicegraphiccard.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicegraphiccard.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/deviceharddrive.tabs.php glpi-0.80.7/ajax/deviceharddrive.tabs.php
--- glpi-0.80.5/ajax/deviceharddrive.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/deviceharddrive.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: deviceharddrive.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: deviceharddrive.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/devicememory.tabs.php glpi-0.80.7/ajax/devicememory.tabs.php
--- glpi-0.80.5/ajax/devicememory.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/devicememory.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicememory.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicememory.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/devicememorytype.tabs.php glpi-0.80.7/ajax/devicememorytype.tabs.php
--- glpi-0.80.5/ajax/devicememorytype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/devicememorytype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicememorytype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicememorytype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/devicemotherboard.tabs.php glpi-0.80.7/ajax/devicemotherboard.tabs.php
--- glpi-0.80.5/ajax/devicemotherboard.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/devicemotherboard.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicemotherboard.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicemotherboard.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/devicenetworkcard.tabs.php glpi-0.80.7/ajax/devicenetworkcard.tabs.php
--- glpi-0.80.5/ajax/devicenetworkcard.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/devicenetworkcard.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicenetworkcard.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicenetworkcard.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/devicepci.tabs.php glpi-0.80.7/ajax/devicepci.tabs.php
--- glpi-0.80.5/ajax/devicepci.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/devicepci.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicepci.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicepci.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/devicepowersupply.tabs.php glpi-0.80.7/ajax/devicepowersupply.tabs.php
--- glpi-0.80.5/ajax/devicepowersupply.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/devicepowersupply.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicepowersupply.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicepowersupply.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/deviceprocessor.tabs.php glpi-0.80.7/ajax/deviceprocessor.tabs.php
--- glpi-0.80.5/ajax/deviceprocessor.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/deviceprocessor.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: deviceprocessor.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: deviceprocessor.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/devicesoundcard.tabs.php glpi-0.80.7/ajax/devicesoundcard.tabs.php
--- glpi-0.80.5/ajax/devicesoundcard.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/devicesoundcard.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicesoundcard.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicesoundcard.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/device.tabs.php glpi-0.80.7/ajax/device.tabs.php
--- glpi-0.80.5/ajax/device.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/device.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: device.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: device.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/displaypreference.tabs.php glpi-0.80.7/ajax/displaypreference.tabs.php
--- glpi-0.80.5/ajax/displaypreference.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/displaypreference.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: displaypreference.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: displaypreference.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/documentcategory.tabs.php glpi-0.80.7/ajax/documentcategory.tabs.php
--- glpi-0.80.5/ajax/documentcategory.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/documentcategory.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: documentcategory.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: documentcategory.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/document.tabs.php glpi-0.80.7/ajax/document.tabs.php
--- glpi-0.80.5/ajax/document.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/document.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: document.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: document.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/documenttype.tabs.php glpi-0.80.7/ajax/documenttype.tabs.php
--- glpi-0.80.5/ajax/documenttype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/documenttype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: documenttype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: documenttype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/domain.tabs.php glpi-0.80.7/ajax/domain.tabs.php
--- glpi-0.80.5/ajax/domain.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/domain.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: domain.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: domain.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownAllItems.php glpi-0.80.7/ajax/dropdownAllItems.php
--- glpi-0.80.5/ajax/dropdownAllItems.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownAllItems.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownAllItems.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: dropdownAllItems.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdown.common.tabs.php glpi-0.80.7/ajax/dropdown.common.tabs.php
--- glpi-0.80.5/ajax/dropdown.common.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdown.common.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdown.common.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: dropdown.common.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownConnect.php glpi-0.80.7/ajax/dropdownConnect.php
--- glpi-0.80.5/ajax/dropdownConnect.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownConnect.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownConnect.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: dropdownConnect.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownConnectPortDeviceType.php glpi-0.80.7/ajax/dropdownConnectPortDeviceType.php
--- glpi-0.80.5/ajax/dropdownConnectPortDeviceType.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownConnectPortDeviceType.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownConnectPortDeviceType.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: dropdownConnectPortDeviceType.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownConnectPort.php glpi-0.80.7/ajax/dropdownConnectPort.php
--- glpi-0.80.5/ajax/dropdownConnectPort.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownConnectPort.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownConnectPort.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: dropdownConnectPort.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownFieldsBlacklist.php glpi-0.80.7/ajax/dropdownFieldsBlacklist.php
--- glpi-0.80.5/ajax/dropdownFieldsBlacklist.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownFieldsBlacklist.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownFieldsBlacklist.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: dropdownFieldsBlacklist.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownFindNum.php glpi-0.80.7/ajax/dropdownFindNum.php
--- glpi-0.80.5/ajax/dropdownFindNum.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownFindNum.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownFindNum.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: dropdownFindNum.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownInstallVersion.php glpi-0.80.7/ajax/dropdownInstallVersion.php
--- glpi-0.80.5/ajax/dropdownInstallVersion.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownInstallVersion.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownInstallVersion.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: dropdownInstallVersion.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownMassiveActionAddActor.php glpi-0.80.7/ajax/dropdownMassiveActionAddActor.php
--- glpi-0.80.5/ajax/dropdownMassiveActionAddActor.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownMassiveActionAddActor.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownMassiveActionAddActor.php 14815 2011-06-29 07:27:02Z remi $
+ * @version $Id: dropdownMassiveActionAddActor.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownMassiveActionAuthMethods.php glpi-0.80.7/ajax/dropdownMassiveActionAuthMethods.php
--- glpi-0.80.5/ajax/dropdownMassiveActionAuthMethods.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownMassiveActionAuthMethods.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownMassiveActionAuthMethods.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: dropdownMassiveActionAuthMethods.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownMassiveActionField.php glpi-0.80.7/ajax/dropdownMassiveActionField.php
--- glpi-0.80.5/ajax/dropdownMassiveActionField.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownMassiveActionField.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownMassiveActionField.php 15274 2011-08-09 09:28:29Z walid $
+ * @version $Id: dropdownMassiveActionField.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownMassiveAction.php glpi-0.80.7/ajax/dropdownMassiveAction.php
--- glpi-0.80.5/ajax/dropdownMassiveAction.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownMassiveAction.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownMassiveAction.php 15845 2011-10-10 09:05:17Z yllen $
+ * @version $Id: dropdownMassiveAction.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownMassiveActionPorts.php glpi-0.80.7/ajax/dropdownMassiveActionPorts.php
--- glpi-0.80.5/ajax/dropdownMassiveActionPorts.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownMassiveActionPorts.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownMassiveActionPorts.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: dropdownMassiveActionPorts.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownNetpoint.php glpi-0.80.7/ajax/dropdownNetpoint.php
--- glpi-0.80.5/ajax/dropdownNetpoint.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownNetpoint.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownNetpoint.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: dropdownNetpoint.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownNotificationEvent.php glpi-0.80.7/ajax/dropdownNotificationEvent.php
--- glpi-0.80.5/ajax/dropdownNotificationEvent.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownNotificationEvent.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownNotificationEvent.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: dropdownNotificationEvent.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownNotificationTemplate.php glpi-0.80.7/ajax/dropdownNotificationTemplate.php
--- glpi-0.80.5/ajax/dropdownNotificationTemplate.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownNotificationTemplate.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownNotificationTemplate.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: dropdownNotificationTemplate.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownRubDocument.php glpi-0.80.7/ajax/dropdownRubDocument.php
--- glpi-0.80.5/ajax/dropdownRubDocument.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownRubDocument.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownRubDocument.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: dropdownRubDocument.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownRules.php glpi-0.80.7/ajax/dropdownRules.php
--- glpi-0.80.5/ajax/dropdownRules.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownRules.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownRules.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: dropdownRules.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownSelectSoftwareLicense.php glpi-0.80.7/ajax/dropdownSelectSoftwareLicense.php
--- glpi-0.80.5/ajax/dropdownSelectSoftwareLicense.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownSelectSoftwareLicense.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownSelectSoftwareLicense.php 15839 2011-10-06 06:58:02Z remi $
+ * @version $Id: dropdownSelectSoftwareLicense.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownSelectSoftware.php glpi-0.80.7/ajax/dropdownSelectSoftware.php
--- glpi-0.80.5/ajax/dropdownSelectSoftware.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownSelectSoftware.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownSelectSoftware.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: dropdownSelectSoftware.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownSoftwareLicense.php glpi-0.80.7/ajax/dropdownSoftwareLicense.php
--- glpi-0.80.5/ajax/dropdownSoftwareLicense.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownSoftwareLicense.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownSoftwareLicense.php 15839 2011-10-06 06:58:02Z remi $
+ * @version $Id: dropdownSoftwareLicense.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownTicketActors.php glpi-0.80.7/ajax/dropdownTicketActors.php
--- glpi-0.80.5/ajax/dropdownTicketActors.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownTicketActors.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownTicketActors.php 14923 2011-07-13 13:45:43Z moyo $
+ * @version $Id: dropdownTicketActors.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownTrackingDeviceType.php glpi-0.80.7/ajax/dropdownTrackingDeviceType.php
--- glpi-0.80.5/ajax/dropdownTrackingDeviceType.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownTrackingDeviceType.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownTrackingDeviceType.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: dropdownTrackingDeviceType.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownUnicityFields.php glpi-0.80.7/ajax/dropdownUnicityFields.php
--- glpi-0.80.5/ajax/dropdownUnicityFields.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownUnicityFields.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownUnicityFields.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: dropdownUnicityFields.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownUsers.php glpi-0.80.7/ajax/dropdownUsers.php
--- glpi-0.80.5/ajax/dropdownUsers.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownUsers.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownUsers.php 15783 2011-09-27 08:34:08Z moyo $
+ * @version $Id: dropdownUsers.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownUsersTracking.php glpi-0.80.7/ajax/dropdownUsersTracking.php
--- glpi-0.80.5/ajax/dropdownUsersTracking.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownUsersTracking.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownUsersTracking.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: dropdownUsersTracking.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownValue.php glpi-0.80.7/ajax/dropdownValue.php
--- glpi-0.80.5/ajax/dropdownValue.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownValue.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownValue.php 15573 2011-09-01 10:10:06Z moyo $
+ * @version $Id: dropdownValue.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/dropdownValuesBlacklist.php glpi-0.80.7/ajax/dropdownValuesBlacklist.php
--- glpi-0.80.5/ajax/dropdownValuesBlacklist.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/dropdownValuesBlacklist.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdownValuesBlacklist.php 15855 2011-10-14 09:10:06Z walid $
+ * @version $Id: dropdownValuesBlacklist.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/entity.tabs.php glpi-0.80.7/ajax/entity.tabs.php
--- glpi-0.80.5/ajax/entity.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/entity.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: entity.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: entity.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/entitytree.php glpi-0.80.7/ajax/entitytree.php
--- glpi-0.80.5/ajax/entitytree.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/entitytree.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: entitytree.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: entitytree.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/entitytreesons.php glpi-0.80.7/ajax/entitytreesons.php
--- glpi-0.80.5/ajax/entitytreesons.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/entitytreesons.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: entitytreesons.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: entitytreesons.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/fieldblacklist.tabs.php glpi-0.80.7/ajax/fieldblacklist.tabs.php
--- glpi-0.80.5/ajax/fieldblacklist.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/fieldblacklist.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: fieldblacklist.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: fieldblacklist.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/fieldunicity.tabs.php glpi-0.80.7/ajax/fieldunicity.tabs.php
--- glpi-0.80.5/ajax/fieldunicity.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/fieldunicity.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: fieldunicity.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: fieldunicity.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/filesystem.tabs.php glpi-0.80.7/ajax/filesystem.tabs.php
--- glpi-0.80.5/ajax/filesystem.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/filesystem.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: filesystem.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: filesystem.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/genericdate.php glpi-0.80.7/ajax/genericdate.php
--- glpi-0.80.5/ajax/genericdate.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/genericdate.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: genericdate.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: genericdate.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/group.tabs.php glpi-0.80.7/ajax/group.tabs.php
--- glpi-0.80.5/ajax/group.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/group.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: group.tabs.php 15540 2011-08-30 11:10:33Z yllen $
+ * @version $Id: group.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/holiday.tabs.php glpi-0.80.7/ajax/holiday.tabs.php
--- glpi-0.80.5/ajax/holiday.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/holiday.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: holiday.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: holiday.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/index.php glpi-0.80.7/ajax/index.php
--- glpi-0.80.5/ajax/index.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/index.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: index.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: index.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/inputtext.php glpi-0.80.7/ajax/inputtext.php
--- glpi-0.80.5/ajax/inputtext.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/inputtext.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: inputtext.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: inputtext.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/interfacetype.tabs.php glpi-0.80.7/ajax/interfacetype.tabs.php
--- glpi-0.80.5/ajax/interfacetype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/interfacetype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: interfacetype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: interfacetype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/knowbaseitemcategory.tabs.php glpi-0.80.7/ajax/knowbaseitemcategory.tabs.php
--- glpi-0.80.5/ajax/knowbaseitemcategory.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/knowbaseitemcategory.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: knowbaseitemcategory.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: knowbaseitemcategory.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/knowbaseitem.tabs.php glpi-0.80.7/ajax/knowbaseitem.tabs.php
--- glpi-0.80.5/ajax/knowbaseitem.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/knowbaseitem.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: knowbaseitem.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: knowbaseitem.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ldapdaterestriction.php glpi-0.80.7/ajax/ldapdaterestriction.php
--- glpi-0.80.5/ajax/ldapdaterestriction.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ldapdaterestriction.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ldapdaterestriction.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ldapdaterestriction.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/link.tabs.php glpi-0.80.7/ajax/link.tabs.php
--- glpi-0.80.5/ajax/link.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/link.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: link.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: link.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/location.tabs.php glpi-0.80.7/ajax/location.tabs.php
--- glpi-0.80.5/ajax/location.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/location.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: location.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: location.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/mailcollector.tabs.php glpi-0.80.7/ajax/mailcollector.tabs.php
--- glpi-0.80.5/ajax/mailcollector.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/mailcollector.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: mailcollector.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: mailcollector.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/manufacturer.tabs.php glpi-0.80.7/ajax/manufacturer.tabs.php
--- glpi-0.80.5/ajax/manufacturer.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/manufacturer.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: manufacturer.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: manufacturer.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/monitormodel.tabs.php glpi-0.80.7/ajax/monitormodel.tabs.php
--- glpi-0.80.5/ajax/monitormodel.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/monitormodel.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: monitormodel.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: monitormodel.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/monitor.tabs.php glpi-0.80.7/ajax/monitor.tabs.php
--- glpi-0.80.5/ajax/monitor.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/monitor.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: monitor.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: monitor.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/monitortype.tabs.php glpi-0.80.7/ajax/monitortype.tabs.php
--- glpi-0.80.5/ajax/monitortype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/monitortype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: monitortype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: monitortype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/netpoint.tabs.php glpi-0.80.7/ajax/netpoint.tabs.php
--- glpi-0.80.5/ajax/netpoint.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/netpoint.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: netpoint.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: netpoint.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/networkequipmentfirmware.tabs.php glpi-0.80.7/ajax/networkequipmentfirmware.tabs.php
--- glpi-0.80.5/ajax/networkequipmentfirmware.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/networkequipmentfirmware.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkequipmentfirmware.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkequipmentfirmware.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/networkequipmentmodel.tabs.php glpi-0.80.7/ajax/networkequipmentmodel.tabs.php
--- glpi-0.80.5/ajax/networkequipmentmodel.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/networkequipmentmodel.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkequipmentmodel.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkequipmentmodel.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/networkequipment.tabs.php glpi-0.80.7/ajax/networkequipment.tabs.php
--- glpi-0.80.5/ajax/networkequipment.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/networkequipment.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkequipment.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkequipment.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/networkequipmenttype.tabs.php glpi-0.80.7/ajax/networkequipmenttype.tabs.php
--- glpi-0.80.5/ajax/networkequipmenttype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/networkequipmenttype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkequipmenttype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkequipmenttype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/networkinterface.tabs.php glpi-0.80.7/ajax/networkinterface.tabs.php
--- glpi-0.80.5/ajax/networkinterface.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/networkinterface.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkinterface.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkinterface.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/networkport.tabs.php glpi-0.80.7/ajax/networkport.tabs.php
--- glpi-0.80.5/ajax/networkport.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/networkport.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkport.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkport.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/network.tabs.php glpi-0.80.7/ajax/network.tabs.php
--- glpi-0.80.5/ajax/network.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/network.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: network.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: network.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/notificationmailsetting.tabs.php glpi-0.80.7/ajax/notificationmailsetting.tabs.php
--- glpi-0.80.5/ajax/notificationmailsetting.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/notificationmailsetting.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: notificationmailsetting.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notificationmailsetting.tabs.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/notification.tabs.php glpi-0.80.7/ajax/notification.tabs.php
--- glpi-0.80.5/ajax/notification.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/notification.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: notification.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notification.tabs.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/notificationtemplate.tabs.php glpi-0.80.7/ajax/notificationtemplate.tabs.php
--- glpi-0.80.5/ajax/notificationtemplate.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/notificationtemplate.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: notificationtemplate.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notificationtemplate.tabs.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/notificationtemplatetranslation.tabs.php glpi-0.80.7/ajax/notificationtemplatetranslation.tabs.php
--- glpi-0.80.5/ajax/notificationtemplatetranslation.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/notificationtemplatetranslation.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: notificationtemplatetranslation.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notificationtemplatetranslation.tabs.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ocsserver.tabs.php glpi-0.80.7/ajax/ocsserver.tabs.php
--- glpi-0.80.5/ajax/ocsserver.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ocsserver.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: ocsserver.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ocsserver.tabs.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/operatingsystemservicepack.tabs.php glpi-0.80.7/ajax/operatingsystemservicepack.tabs.php
--- glpi-0.80.5/ajax/operatingsystemservicepack.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/operatingsystemservicepack.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: operatingsystemservicepack.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: operatingsystemservicepack.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/operatingsystem.tabs.php glpi-0.80.7/ajax/operatingsystem.tabs.php
--- glpi-0.80.5/ajax/operatingsystem.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/operatingsystem.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: operatingsystem.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: operatingsystem.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/operatingsystemversion.tabs.php glpi-0.80.7/ajax/operatingsystemversion.tabs.php
--- glpi-0.80.5/ajax/operatingsystemversion.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/operatingsystemversion.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: operatingsystemversion.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: operatingsystemversion.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/peripheralmodel.tabs.php glpi-0.80.7/ajax/peripheralmodel.tabs.php
--- glpi-0.80.5/ajax/peripheralmodel.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/peripheralmodel.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: peripheralmodel.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: peripheralmodel.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/peripheral.tabs.php glpi-0.80.7/ajax/peripheral.tabs.php
--- glpi-0.80.5/ajax/peripheral.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/peripheral.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: peripheral.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: peripheral.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/peripheraltype.tabs.php glpi-0.80.7/ajax/peripheraltype.tabs.php
--- glpi-0.80.5/ajax/peripheraltype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/peripheraltype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: peripheraltype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: peripheraltype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/phonemodel.tabs.php glpi-0.80.7/ajax/phonemodel.tabs.php
--- glpi-0.80.5/ajax/phonemodel.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/phonemodel.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: phonemodel.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: phonemodel.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/phonepowersupply.tabs.php glpi-0.80.7/ajax/phonepowersupply.tabs.php
--- glpi-0.80.5/ajax/phonepowersupply.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/phonepowersupply.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: phonepowersupply.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: phonepowersupply.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/phone.tabs.php glpi-0.80.7/ajax/phone.tabs.php
--- glpi-0.80.5/ajax/phone.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/phone.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: phone.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: phone.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/phonetype.tabs.php glpi-0.80.7/ajax/phonetype.tabs.php
--- glpi-0.80.5/ajax/phonetype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/phonetype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: phonetype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: phonetype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/planningend.php glpi-0.80.7/ajax/planningend.php
--- glpi-0.80.5/ajax/planningend.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/planningend.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: planningend.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: planningend.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/planning.php glpi-0.80.7/ajax/planning.php
--- glpi-0.80.5/ajax/planning.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/planning.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: planning.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: planning.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/preference.tabs.php glpi-0.80.7/ajax/preference.tabs.php
--- glpi-0.80.5/ajax/preference.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/preference.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: preference.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: preference.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/printermodel.tabs.php glpi-0.80.7/ajax/printermodel.tabs.php
--- glpi-0.80.5/ajax/printermodel.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/printermodel.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: printermodel.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: printermodel.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/printer.tabs.php glpi-0.80.7/ajax/printer.tabs.php
--- glpi-0.80.5/ajax/printer.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/printer.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: printer.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: printer.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/printertype.tabs.php glpi-0.80.7/ajax/printertype.tabs.php
--- glpi-0.80.5/ajax/printertype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/printertype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: printertype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: printertype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/priority.php glpi-0.80.7/ajax/priority.php
--- glpi-0.80.5/ajax/priority.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/priority.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: priority.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: priority.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/private_public.php glpi-0.80.7/ajax/private_public.php
--- glpi-0.80.5/ajax/private_public.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/private_public.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: private_public.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: private_public.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/profile.tabs.php glpi-0.80.7/ajax/profile.tabs.php
--- glpi-0.80.5/ajax/profile.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/profile.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: profile.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: profile.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/requesttype.tabs.php glpi-0.80.7/ajax/requesttype.tabs.php
--- glpi-0.80.5/ajax/requesttype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/requesttype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: requesttype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: requesttype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruleaction.php glpi-0.80.7/ajax/ruleaction.php
--- glpi-0.80.5/ajax/ruleaction.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruleaction.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruleaction.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruleaction.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruleactionvalue.php glpi-0.80.7/ajax/ruleactionvalue.php
--- glpi-0.80.5/ajax/ruleactionvalue.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruleactionvalue.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruleactionvalue.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruleactionvalue.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/rule.common.tabs.php glpi-0.80.7/ajax/rule.common.tabs.php
--- glpi-0.80.5/ajax/rule.common.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/rule.common.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: rule.common.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rule.common.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/rulecriteria.php glpi-0.80.7/ajax/rulecriteria.php
--- glpi-0.80.5/ajax/rulecriteria.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/rulecriteria.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: rulecriteria.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rulecriteria.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/rulecriteriavalue.php glpi-0.80.7/ajax/rulecriteriavalue.php
--- glpi-0.80.5/ajax/rulecriteriavalue.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/rulecriteriavalue.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: rulecriteriavalue.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rulecriteriavalue.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruledictionnarycomputermodel.tabs.php glpi-0.80.7/ajax/ruledictionnarycomputermodel.tabs.php
--- glpi-0.80.5/ajax/ruledictionnarycomputermodel.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruledictionnarycomputermodel.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruledictionnarycomputermodel.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarycomputermodel.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruledictionnarycomputertype.tabs.php glpi-0.80.7/ajax/ruledictionnarycomputertype.tabs.php
--- glpi-0.80.5/ajax/ruledictionnarycomputertype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruledictionnarycomputertype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruledictionnarycomputertype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarycomputertype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruledictionnarymanufacturer.tabs.php glpi-0.80.7/ajax/ruledictionnarymanufacturer.tabs.php
--- glpi-0.80.5/ajax/ruledictionnarymanufacturer.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruledictionnarymanufacturer.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruledictionnarymanufacturer.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarymanufacturer.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruledictionnarymonitormodel.tabs.php glpi-0.80.7/ajax/ruledictionnarymonitormodel.tabs.php
--- glpi-0.80.5/ajax/ruledictionnarymonitormodel.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruledictionnarymonitormodel.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruledictionnarymonitormodel.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarymonitormodel.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruledictionnarymonitortype.tabs.php glpi-0.80.7/ajax/ruledictionnarymonitortype.tabs.php
--- glpi-0.80.5/ajax/ruledictionnarymonitortype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruledictionnarymonitortype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruledictionnarymonitortype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarymonitortype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruledictionnarynetworkequipmentmodel.tabs.php glpi-0.80.7/ajax/ruledictionnarynetworkequipmentmodel.tabs.php
--- glpi-0.80.5/ajax/ruledictionnarynetworkequipmentmodel.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruledictionnarynetworkequipmentmodel.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruledictionnarynetworkequipmentmodel.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarynetworkequipmentmodel.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruledictionnarynetworkequipmenttype.tabs.php glpi-0.80.7/ajax/ruledictionnarynetworkequipmenttype.tabs.php
--- glpi-0.80.5/ajax/ruledictionnarynetworkequipmenttype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruledictionnarynetworkequipmenttype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruledictionnarynetworkequipmenttype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarynetworkequipmenttype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruledictionnaryoperatingsystemservicepack.tabs.php glpi-0.80.7/ajax/ruledictionnaryoperatingsystemservicepack.tabs.php
--- glpi-0.80.5/ajax/ruledictionnaryoperatingsystemservicepack.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruledictionnaryoperatingsystemservicepack.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruledictionnaryoperatingsystemservicepack.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryoperatingsystemservicepack.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruledictionnaryoperatingsystem.tabs.php glpi-0.80.7/ajax/ruledictionnaryoperatingsystem.tabs.php
--- glpi-0.80.5/ajax/ruledictionnaryoperatingsystem.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruledictionnaryoperatingsystem.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruledictionnaryoperatingsystem.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryoperatingsystem.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruledictionnaryoperatingsystemversion.tabs.php glpi-0.80.7/ajax/ruledictionnaryoperatingsystemversion.tabs.php
--- glpi-0.80.5/ajax/ruledictionnaryoperatingsystemversion.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruledictionnaryoperatingsystemversion.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruledictionnaryoperatingsystemversion.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryoperatingsystemversion.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruledictionnaryperipheralmodel.tabs.php glpi-0.80.7/ajax/ruledictionnaryperipheralmodel.tabs.php
--- glpi-0.80.5/ajax/ruledictionnaryperipheralmodel.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruledictionnaryperipheralmodel.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruledictionnaryperipheralmodel.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryperipheralmodel.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruledictionnaryperipheraltype.tabs.php glpi-0.80.7/ajax/ruledictionnaryperipheraltype.tabs.php
--- glpi-0.80.5/ajax/ruledictionnaryperipheraltype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruledictionnaryperipheraltype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruledictionnaryperipheraltype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryperipheraltype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruledictionnaryphonemodel.tabs.php glpi-0.80.7/ajax/ruledictionnaryphonemodel.tabs.php
--- glpi-0.80.5/ajax/ruledictionnaryphonemodel.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruledictionnaryphonemodel.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruledictionnaryphonemodel.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryphonemodel.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruledictionnaryphonetype.tabs.php glpi-0.80.7/ajax/ruledictionnaryphonetype.tabs.php
--- glpi-0.80.5/ajax/ruledictionnaryphonetype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruledictionnaryphonetype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruledictionnaryphonetype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryphonetype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruledictionnaryprintermodel.tabs.php glpi-0.80.7/ajax/ruledictionnaryprintermodel.tabs.php
--- glpi-0.80.5/ajax/ruledictionnaryprintermodel.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruledictionnaryprintermodel.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruledictionnaryprintermodel.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryprintermodel.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruledictionnaryprinter.tabs.php glpi-0.80.7/ajax/ruledictionnaryprinter.tabs.php
--- glpi-0.80.5/ajax/ruledictionnaryprinter.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruledictionnaryprinter.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruledictionnaryprinter.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryprinter.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruledictionnaryprintertype.tabs.php glpi-0.80.7/ajax/ruledictionnaryprintertype.tabs.php
--- glpi-0.80.5/ajax/ruledictionnaryprintertype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruledictionnaryprintertype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruledictionnaryprintertype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryprintertype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruledictionnarysoftware.tabs.php glpi-0.80.7/ajax/ruledictionnarysoftware.tabs.php
--- glpi-0.80.5/ajax/ruledictionnarysoftware.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruledictionnarysoftware.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruledictionnarysoftware.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarysoftware.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruleimportcomputer.tabs.php glpi-0.80.7/ajax/ruleimportcomputer.tabs.php
--- glpi-0.80.5/ajax/ruleimportcomputer.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruleimportcomputer.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruleimportcomputer.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruleimportcomputer.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/rulemailcollector.tabs.php glpi-0.80.7/ajax/rulemailcollector.tabs.php
--- glpi-0.80.5/ajax/rulemailcollector.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/rulemailcollector.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: rulemailcollector.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rulemailcollector.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruleocs.tabs.php glpi-0.80.7/ajax/ruleocs.tabs.php
--- glpi-0.80.5/ajax/ruleocs.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruleocs.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruleocs.tabs.php 14730 2011-06-21 10:35:21Z tsmr $
+ * @version $Id: ruleocs.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/rulerightparameter.tabs.php glpi-0.80.7/ajax/rulerightparameter.tabs.php
--- glpi-0.80.5/ajax/rulerightparameter.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/rulerightparameter.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: rulerightparameter.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rulerightparameter.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruleright.tabs.php glpi-0.80.7/ajax/ruleright.tabs.php
--- glpi-0.80.5/ajax/ruleright.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruleright.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruleright.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruleright.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/rulesoftwarecategory.tabs.php glpi-0.80.7/ajax/rulesoftwarecategory.tabs.php
--- glpi-0.80.5/ajax/rulesoftwarecategory.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/rulesoftwarecategory.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: rulesoftwarecategory.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rulesoftwarecategory.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/rules.tabs.php glpi-0.80.7/ajax/rules.tabs.php
--- glpi-0.80.5/ajax/rules.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/rules.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: rules.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rules.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ruleticket.tabs.php glpi-0.80.7/ajax/ruleticket.tabs.php
--- glpi-0.80.5/ajax/ruleticket.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ruleticket.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ruleticket.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruleticket.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/searchoption.php glpi-0.80.7/ajax/searchoption.php
--- glpi-0.80.5/ajax/searchoption.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/searchoption.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: searchoption.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: searchoption.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/searchoptionvalue.php glpi-0.80.7/ajax/searchoptionvalue.php
--- glpi-0.80.5/ajax/searchoptionvalue.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/searchoptionvalue.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: searchoptionvalue.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: searchoptionvalue.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/slalevel.tabs.php glpi-0.80.7/ajax/slalevel.tabs.php
--- glpi-0.80.5/ajax/slalevel.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/slalevel.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: slalevel.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: slalevel.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/sla.tabs.php glpi-0.80.7/ajax/sla.tabs.php
--- glpi-0.80.5/ajax/sla.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/sla.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: sla.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: sla.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -56,7 +55,7 @@
          $slalevel->showForSLA($sla);
          $rule = new RuleTicket();
          $rule->showAndAddRuleForm($sla);
-         Ticket::showListForItem('Sla', $_POST["id"]);
+         Ticket::showListForItem('SLA', $_POST["id"]);
          Plugin::displayAction($sla, $_REQUEST['glpi_tab']);
          break;
 
@@ -66,7 +65,7 @@
          break;
 
       case 6:
-         Ticket::showListForItem('Sla', $_POST["id"]);
+         Ticket::showListForItem('SLA', $_POST["id"]);
          break;
 
       default :
diff -Nru glpi-0.80.5/ajax/softwarecategory.tabs.php glpi-0.80.7/ajax/softwarecategory.tabs.php
--- glpi-0.80.5/ajax/softwarecategory.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/softwarecategory.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: softwarecategory.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: softwarecategory.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/softwarelicense.tabs.php glpi-0.80.7/ajax/softwarelicense.tabs.php
--- glpi-0.80.5/ajax/softwarelicense.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/softwarelicense.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: softwarelicense.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: softwarelicense.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/softwarelicensetype.tabs.php glpi-0.80.7/ajax/softwarelicensetype.tabs.php
--- glpi-0.80.5/ajax/softwarelicensetype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/softwarelicensetype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: softwarelicensetype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: softwarelicensetype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/software.tabs.php glpi-0.80.7/ajax/software.tabs.php
--- glpi-0.80.5/ajax/software.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/software.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: software.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: software.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/softwareversion.tabs.php glpi-0.80.7/ajax/softwareversion.tabs.php
--- glpi-0.80.5/ajax/softwareversion.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/softwareversion.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: softwareversion.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: softwareversion.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/solution.php glpi-0.80.7/ajax/solution.php
--- glpi-0.80.5/ajax/solution.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/solution.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: solution.php 15662 2011-09-13 06:40:13Z moyo $
+ * @version $Id: solution.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/state.tabs.php glpi-0.80.7/ajax/state.tabs.php
--- glpi-0.80.5/ajax/state.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/state.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: state.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: state.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/supplier.tabs.php glpi-0.80.7/ajax/supplier.tabs.php
--- glpi-0.80.5/ajax/supplier.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/supplier.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: supplier.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: supplier.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/suppliertype.tabs.php glpi-0.80.7/ajax/suppliertype.tabs.php
--- glpi-0.80.5/ajax/suppliertype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/suppliertype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: suppliertype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: suppliertype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/taskcategory.tabs.php glpi-0.80.7/ajax/taskcategory.tabs.php
--- glpi-0.80.5/ajax/taskcategory.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/taskcategory.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: taskcategory.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: taskcategory.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/textarea.php glpi-0.80.7/ajax/textarea.php
--- glpi-0.80.5/ajax/textarea.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/textarea.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: textarea.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: textarea.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ticketcategory.tabs.php glpi-0.80.7/ajax/ticketcategory.tabs.php
--- glpi-0.80.5/ajax/ticketcategory.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ticketcategory.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ticketcategory.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ticketcategory.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ticketsatisfaction.php glpi-0.80.7/ajax/ticketsatisfaction.php
--- glpi-0.80.5/ajax/ticketsatisfaction.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ticketsatisfaction.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ticketsatisfaction.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ticketsatisfaction.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ticketsolutiontemplate.tabs.php glpi-0.80.7/ajax/ticketsolutiontemplate.tabs.php
--- glpi-0.80.5/ajax/ticketsolutiontemplate.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ticketsolutiontemplate.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ticketsolutiontemplate.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ticketsolutiontemplate.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ticketsolutiontype.tabs.php glpi-0.80.7/ajax/ticketsolutiontype.tabs.php
--- glpi-0.80.5/ajax/ticketsolutiontype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ticketsolutiontype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ticketsolutiontype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ticketsolutiontype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ticket.tabs.php glpi-0.80.7/ajax/ticket.tabs.php
--- glpi-0.80.5/ajax/ticket.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ticket.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ticket.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ticket.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/ticketvalidation.tabs.php glpi-0.80.7/ajax/ticketvalidation.tabs.php
--- glpi-0.80.5/ajax/ticketvalidation.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/ticketvalidation.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ticketvalidation.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ticketvalidation.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/transfers.php glpi-0.80.7/ajax/transfers.php
--- glpi-0.80.5/ajax/transfers.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/transfers.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: transfers.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: transfers.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/transfer.tabs.php glpi-0.80.7/ajax/transfer.tabs.php
--- glpi-0.80.5/ajax/transfer.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/transfer.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: transfer.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: transfer.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/uemailUpdate.php glpi-0.80.7/ajax/uemailUpdate.php
--- glpi-0.80.5/ajax/uemailUpdate.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/uemailUpdate.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: uemailUpdate.php 14760 2011-06-24 08:44:25Z remi $
+ * @version $Id: uemailUpdate.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/updatecurrenttab.php glpi-0.80.7/ajax/updatecurrenttab.php
--- glpi-0.80.5/ajax/updatecurrenttab.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/updatecurrenttab.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: updatecurrenttab.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: updatecurrenttab.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/updateMetaSearch.php glpi-0.80.7/ajax/updateMetaSearch.php
--- glpi-0.80.5/ajax/updateMetaSearch.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/updateMetaSearch.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: updateMetaSearch.php 15188 2011-08-03 06:59:57Z yllen $
+ * @version $Id: updateMetaSearch.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/updateTrackingDeviceType.php glpi-0.80.7/ajax/updateTrackingDeviceType.php
--- glpi-0.80.5/ajax/updateTrackingDeviceType.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/updateTrackingDeviceType.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: updateTrackingDeviceType.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: updateTrackingDeviceType.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/usercategory.tabs.php glpi-0.80.7/ajax/usercategory.tabs.php
--- glpi-0.80.5/ajax/usercategory.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/usercategory.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: usercategory.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: usercategory.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/user.tabs.php glpi-0.80.7/ajax/user.tabs.php
--- glpi-0.80.5/ajax/user.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/user.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: user.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: user.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/usertitle.tabs.php glpi-0.80.7/ajax/usertitle.tabs.php
--- glpi-0.80.5/ajax/usertitle.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/usertitle.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: usertitle.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: usertitle.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/viewfollowup.php glpi-0.80.7/ajax/viewfollowup.php
--- glpi-0.80.5/ajax/viewfollowup.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/viewfollowup.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: viewfollowup.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: viewfollowup.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/virtualmachinestate.tabs.php glpi-0.80.7/ajax/virtualmachinestate.tabs.php
--- glpi-0.80.5/ajax/virtualmachinestate.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/virtualmachinestate.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: virtualmachinestate.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: virtualmachinestate.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/virtualmachinesystem.tabs.php glpi-0.80.7/ajax/virtualmachinesystem.tabs.php
--- glpi-0.80.5/ajax/virtualmachinesystem.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/virtualmachinesystem.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: virtualmachinesystem.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: virtualmachinesystem.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/virtualmachinetype.tabs.php glpi-0.80.7/ajax/virtualmachinetype.tabs.php
--- glpi-0.80.5/ajax/virtualmachinetype.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/virtualmachinetype.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: virtualmachinetype.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: virtualmachinetype.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/ajax/vlan.tabs.php glpi-0.80.7/ajax/vlan.tabs.php
--- glpi-0.80.5/ajax/vlan.tabs.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/ajax/vlan.tabs.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: vlan.tabs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: vlan.tabs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/config/based_config.php glpi-0.80.7/config/based_config.php
--- glpi-0.80.5/config/based_config.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/config/based_config.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: based_config.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: based_config.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/config/config.php glpi-0.80.7/config/config.php
--- glpi-0.80.5/config/config.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/config/config.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: config.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: config.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/config/define.php glpi-0.80.7/config/define.php
--- glpi-0.80.5/config/define.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/config/define.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: define.php 15938 2011-10-25 13:17:42Z moyo $
+ * @version $Id: define.php 17459 2012-02-09 20:17:17Z 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
  -------------------------------------------------------------------------
@@ -23,13 +23,12 @@
  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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
 */
 
 // Current version of GLPI
-define("GLPI_VERSION","0.80.5");
+define("GLPI_VERSION","0.80.7");
 define("GLPI_DEMO_MODE","0");
 
 
diff -Nru glpi-0.80.5/css/print.css glpi-0.80.7/css/print.css
--- glpi-0.80.5/css/print.css	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/css/print.css	2012-02-09 20:24:12.000000000 +0000
@@ -1,8 +1,8 @@
 /*
- * @version $Id: print.css 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: print.css 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
  -------------------------------------------------------------------------
@@ -22,8 +22,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
 */
 
diff -Nru glpi-0.80.5/css/style_install.css glpi-0.80.7/css/style_install.css
--- glpi-0.80.5/css/style_install.css	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/css/style_install.css	2012-02-09 20:24:12.000000000 +0000
@@ -1,8 +1,8 @@
 /*
- * @version $Id: style_install.css 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: style_install.css 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
  -------------------------------------------------------------------------
@@ -22,8 +22,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
 */
 
diff -Nru glpi-0.80.5/css/styles.css glpi-0.80.7/css/styles.css
--- glpi-0.80.5/css/styles.css	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/css/styles.css	2012-02-09 20:24:12.000000000 +0000
@@ -1,8 +1,8 @@
 /*
- * @version $Id: styles.css 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: styles.css 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
  -------------------------------------------------------------------------
@@ -22,8 +22,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
 */
 /* ################--------------- GLPI CSS style   ---------------#################### */
diff -Nru glpi-0.80.5/css/styles_ie.css glpi-0.80.7/css/styles_ie.css
--- glpi-0.80.5/css/styles_ie.css	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/css/styles_ie.css	2012-02-09 20:24:12.000000000 +0000
@@ -1,8 +1,8 @@
 /*
- * @version $Id: styles_ie.css 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: styles_ie.css 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
  -------------------------------------------------------------------------
@@ -22,8 +22,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
 */
 /* ################--------------- GLPI CSS style MOD and HACK for IE  ---------------#################### */
diff -Nru glpi-0.80.5/debian/changelog glpi-0.80.7/debian/changelog
--- glpi-0.80.5/debian/changelog	2011-10-27 19:36:36.000000000 +0000
+++ glpi-0.80.7/debian/changelog	2012-02-11 10:27:42.000000000 +0000
@@ -1,3 +1,12 @@
+glpi (0.80.7-1) unstable; urgency=high
+
+  * Imported Upstream version 0.80.7
+    - contains a security fix for a file inclusion (CVE-2011-1037)
+      http://permalink.gmane.org/gmane.comp.security.full-disclosure/84497
+      (Closes: #659383)
+
+ -- Pierre Chifflier <pollux@debian.org>  Sat, 11 Feb 2012 11:27:42 +0100
+
 glpi (0.80.5-1) unstable; urgency=low
 
   * Imported Upstream version 0.80.5
diff -Nru glpi-0.80.5/front/authldap.form.php glpi-0.80.7/front/authldap.form.php
--- glpi-0.80.5/front/authldap.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/authldap.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: authldap.form.php 15092 2011-07-28 14:17:03Z remi $
+ * @version $Id: authldap.form.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/authldap.php glpi-0.80.7/front/authldap.php
--- glpi-0.80.5/front/authldap.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/authldap.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: authldap.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: authldap.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/authmail.form.php glpi-0.80.7/front/authmail.form.php
--- glpi-0.80.5/front/authmail.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/authmail.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: authmail.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: authmail.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/authmail.php glpi-0.80.7/front/authmail.php
--- glpi-0.80.5/front/authmail.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/authmail.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: authmail.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: authmail.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/auth.others.php glpi-0.80.7/front/auth.others.php
--- glpi-0.80.5/front/auth.others.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/auth.others.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: auth.others.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: auth.others.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/auth.settings.php glpi-0.80.7/front/auth.settings.php
--- glpi-0.80.5/front/auth.settings.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/auth.settings.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: auth.settings.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: auth.settings.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/autoupdatesystem.form.php glpi-0.80.7/front/autoupdatesystem.form.php
--- glpi-0.80.5/front/autoupdatesystem.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/autoupdatesystem.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: autoupdatesystem.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: autoupdatesystem.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/autoupdatesystem.php glpi-0.80.7/front/autoupdatesystem.php
--- glpi-0.80.5/front/autoupdatesystem.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/autoupdatesystem.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: autoupdatesystem.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: autoupdatesystem.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/backup.php glpi-0.80.7/front/backup.php
--- glpi-0.80.5/front/backup.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/backup.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: backup.php 15170 2011-08-02 12:03:16Z yllen $
+ * @version $Id: backup.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/bookmark.php glpi-0.80.7/front/bookmark.php
--- glpi-0.80.5/front/bookmark.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/bookmark.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: bookmark.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: bookmark.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/budget.form.php glpi-0.80.7/front/budget.form.php
--- glpi-0.80.5/front/budget.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/budget.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: budget.form.php 15453 2011-08-22 10:12:56Z yllen $
+ * @version $Id: budget.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/budget.php glpi-0.80.7/front/budget.php
--- glpi-0.80.5/front/budget.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/budget.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: budget.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: budget.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/calendar.form.php glpi-0.80.7/front/calendar.form.php
--- glpi-0.80.5/front/calendar.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/calendar.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: calendar.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: calendar.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/calendar_holiday.form.php glpi-0.80.7/front/calendar_holiday.form.php
--- glpi-0.80.5/front/calendar_holiday.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/calendar_holiday.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: calendar_holiday.form.php 15453 2011-08-22 10:12:56Z yllen $
+ * @version $Id: calendar_holiday.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/calendar.php glpi-0.80.7/front/calendar.php
--- glpi-0.80.5/front/calendar.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/calendar.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: calendar.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: calendar.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/calendarsegment.form.php glpi-0.80.7/front/calendarsegment.form.php
--- glpi-0.80.5/front/calendarsegment.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/calendarsegment.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: calendarsegment.form.php 15453 2011-08-22 10:12:56Z yllen $
+ * @version $Id: calendarsegment.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/cartridge.form.php glpi-0.80.7/front/cartridge.form.php
--- glpi-0.80.5/front/cartridge.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/cartridge.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: cartridge.form.php 15453 2011-08-22 10:12:56Z yllen $
+ * @version $Id: cartridge.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/cartridgeitem.form.php glpi-0.80.7/front/cartridgeitem.form.php
--- glpi-0.80.5/front/cartridgeitem.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/cartridgeitem.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: cartridgeitem.form.php 15453 2011-08-22 10:12:56Z yllen $
+ * @version $Id: cartridgeitem.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/cartridgeitem.php glpi-0.80.7/front/cartridgeitem.php
--- glpi-0.80.5/front/cartridgeitem.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/cartridgeitem.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: cartridgeitem.php 15453 2011-08-22 10:12:56Z yllen $
+ * @version $Id: cartridgeitem.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/cartridgeitemtype.form.php glpi-0.80.7/front/cartridgeitemtype.form.php
--- glpi-0.80.5/front/cartridgeitemtype.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/cartridgeitemtype.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: cartridgeitemtype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: cartridgeitemtype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/cartridgeitemtype.php glpi-0.80.7/front/cartridgeitemtype.php
--- glpi-0.80.5/front/cartridgeitemtype.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/cartridgeitemtype.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: cartridgeitemtype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: cartridgeitemtype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/central.php glpi-0.80.7/front/central.php
--- glpi-0.80.5/front/central.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/central.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: central.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: central.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/computer_device.form.php glpi-0.80.7/front/computer_device.form.php
--- glpi-0.80.5/front/computer_device.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/computer_device.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: computer_device.form.php 15453 2011-08-22 10:12:56Z yllen $
+ * @version $Id: computer_device.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/computerdisk.form.php glpi-0.80.7/front/computerdisk.form.php
--- glpi-0.80.5/front/computerdisk.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/computerdisk.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: computerdisk.form.php 15453 2011-08-22 10:12:56Z yllen $
+ * @version $Id: computerdisk.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/computer.form.php glpi-0.80.7/front/computer.form.php
--- glpi-0.80.5/front/computer.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/computer.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: computer.form.php 15453 2011-08-22 10:12:56Z yllen $
+ * @version $Id: computer.form.php 17306 2012-01-31 13:09:59Z yllen $
  -------------------------------------------------------------------------
  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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -109,12 +108,14 @@
    glpi_header($_SERVER['HTTP_REFERER']);
 
 // Connect a computer to a printer/monitor/phone/peripheral
-} else if (isset($_POST["connect"]) && isset($_POST["items_id"]) && $_POST["items_id"]>0) {
-   $conn = new Computer_Item();
-   $conn->check(-1, 'w', $_POST);
-   $conn->add($_POST);
-   Event::log($_POST["computers_id"], "computers", 5, "inventory",
-              $_SESSION["glpiname"] ." ".$LANG['log'][27]);
+} else if (isset($_POST["connect"])) {
+   if (isset($_POST["items_id"]) && $_POST["items_id"]>0) {
+      $conn = new Computer_Item();
+      $conn->check(-1, 'w', $_POST);
+      $conn->add($_POST);
+      Event::log($_POST["computers_id"], "computers", 5, "inventory",
+                 $_SESSION["glpiname"] ." ".$LANG['log'][27]);
+   }
    glpi_header($_SERVER['HTTP_REFERER']);
 
 } else if (isset($_POST["unlock_monitor"])) {
diff -Nru glpi-0.80.5/front/computermodel.form.php glpi-0.80.7/front/computermodel.form.php
--- glpi-0.80.5/front/computermodel.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/computermodel.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: computermodel.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: computermodel.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/computermodel.php glpi-0.80.7/front/computermodel.php
--- glpi-0.80.5/front/computermodel.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/computermodel.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: computermodel.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: computermodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/computer.php glpi-0.80.7/front/computer.php
--- glpi-0.80.5/front/computer.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/computer.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: computer.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: computer.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/computer_softwarelicense.form.php glpi-0.80.7/front/computer_softwarelicense.form.php
--- glpi-0.80.5/front/computer_softwarelicense.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/computer_softwarelicense.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: computer_softwarelicense.form.php 15509 2011-08-26 09:14:27Z remi $
+ * @version $Id: computer_softwarelicense.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/computer_softwareversion.form.php glpi-0.80.7/front/computer_softwareversion.form.php
--- glpi-0.80.5/front/computer_softwareversion.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/computer_softwareversion.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: computer_softwareversion.form.php 15509 2011-08-26 09:14:27Z remi $
+ * @version $Id: computer_softwareversion.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/computertype.form.php glpi-0.80.7/front/computertype.form.php
--- glpi-0.80.5/front/computertype.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/computertype.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: computertype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: computertype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/computertype.php glpi-0.80.7/front/computertype.php
--- glpi-0.80.5/front/computertype.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/computertype.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: computertype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: computertype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/computervirtualmachine.form.php glpi-0.80.7/front/computervirtualmachine.form.php
--- glpi-0.80.5/front/computervirtualmachine.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/computervirtualmachine.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: computervirtualmachine.form.php 15453 2011-08-22 10:12:56Z yllen $
+ * @version $Id: computervirtualmachine.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/config.form.php glpi-0.80.7/front/config.form.php
--- glpi-0.80.5/front/config.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/config.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -2,10 +2,10 @@
 
 
 /*
- * @version $Id: config.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: config.form.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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/consumable.form.php glpi-0.80.7/front/consumable.form.php
--- glpi-0.80.5/front/consumable.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/consumable.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: consumable.form.php 15453 2011-08-22 10:12:56Z yllen $
+ * @version $Id: consumable.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/consumableitem.form.php glpi-0.80.7/front/consumableitem.form.php
--- glpi-0.80.5/front/consumableitem.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/consumableitem.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: consumableitem.form.php 15453 2011-08-22 10:12:56Z yllen $
+ * @version $Id: consumableitem.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/consumableitem.php glpi-0.80.7/front/consumableitem.php
--- glpi-0.80.5/front/consumableitem.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/consumableitem.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: consumableitem.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: consumableitem.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/consumableitemtype.form.php glpi-0.80.7/front/consumableitemtype.form.php
--- glpi-0.80.5/front/consumableitemtype.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/consumableitemtype.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: consumableitemtype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: consumableitemtype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/consumableitemtype.php glpi-0.80.7/front/consumableitemtype.php
--- glpi-0.80.5/front/consumableitemtype.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/consumableitemtype.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: consumableitemtype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: consumableitemtype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/contact.form.php glpi-0.80.7/front/contact.form.php
--- glpi-0.80.5/front/contact.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/contact.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: contact.form.php 15453 2011-08-22 10:12:56Z yllen $
+ * @version $Id: contact.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/contact.php glpi-0.80.7/front/contact.php
--- glpi-0.80.5/front/contact.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/contact.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: contact.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: contact.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/contacttype.form.php glpi-0.80.7/front/contacttype.form.php
--- glpi-0.80.5/front/contacttype.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/contacttype.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: contacttype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: contacttype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/contacttype.php glpi-0.80.7/front/contacttype.php
--- glpi-0.80.5/front/contacttype.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/contacttype.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: contacttype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: contacttype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/contract.form.php glpi-0.80.7/front/contract.form.php
--- glpi-0.80.5/front/contract.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/contract.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: contract.form.php 15453 2011-08-22 10:12:56Z yllen $
+ * @version $Id: contract.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/contract.php glpi-0.80.7/front/contract.php
--- glpi-0.80.5/front/contract.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/contract.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: contract.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: contract.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/contracttype.form.php glpi-0.80.7/front/contracttype.form.php
--- glpi-0.80.5/front/contracttype.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/contracttype.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: contracttype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: contracttype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/contracttype.php glpi-0.80.7/front/contracttype.php
--- glpi-0.80.5/front/contracttype.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/contracttype.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: contracttype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: contracttype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/control.php glpi-0.80.7/front/control.php
--- glpi-0.80.5/front/control.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/control.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: control.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: control.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/cron.php glpi-0.80.7/front/cron.php
--- glpi-0.80.5/front/cron.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/cron.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: cron.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: cron.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/crontask.form.php glpi-0.80.7/front/crontask.form.php
--- glpi-0.80.5/front/crontask.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/crontask.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: crontask.form.php 15453 2011-08-22 10:12:56Z yllen $
+ * @version $Id: crontask.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/crontask.php glpi-0.80.7/front/crontask.php
--- glpi-0.80.5/front/crontask.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/crontask.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: crontask.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: crontask.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicecase.form.php glpi-0.80.7/front/devicecase.form.php
--- glpi-0.80.5/front/devicecase.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicecase.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicecase.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicecase.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicecase.php glpi-0.80.7/front/devicecase.php
--- glpi-0.80.5/front/devicecase.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicecase.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicecase.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicecase.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicecasetype.form.php glpi-0.80.7/front/devicecasetype.form.php
--- glpi-0.80.5/front/devicecasetype.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicecasetype.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicecasetype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicecasetype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicecasetype.php glpi-0.80.7/front/devicecasetype.php
--- glpi-0.80.5/front/devicecasetype.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicecasetype.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicecasetype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicecasetype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicecontrol.form.php glpi-0.80.7/front/devicecontrol.form.php
--- glpi-0.80.5/front/devicecontrol.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicecontrol.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicecontrol.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicecontrol.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicecontrol.php glpi-0.80.7/front/devicecontrol.php
--- glpi-0.80.5/front/devicecontrol.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicecontrol.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicecontrol.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicecontrol.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicedrive.form.php glpi-0.80.7/front/devicedrive.form.php
--- glpi-0.80.5/front/devicedrive.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicedrive.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicedrive.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicedrive.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicedrive.php glpi-0.80.7/front/devicedrive.php
--- glpi-0.80.5/front/devicedrive.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicedrive.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicedrive.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicedrive.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicegraphiccard.form.php glpi-0.80.7/front/devicegraphiccard.form.php
--- glpi-0.80.5/front/devicegraphiccard.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicegraphiccard.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicegraphiccard.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicegraphiccard.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicegraphiccard.php glpi-0.80.7/front/devicegraphiccard.php
--- glpi-0.80.5/front/devicegraphiccard.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicegraphiccard.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicegraphiccard.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicegraphiccard.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/deviceharddrive.form.php glpi-0.80.7/front/deviceharddrive.form.php
--- glpi-0.80.5/front/deviceharddrive.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/deviceharddrive.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: deviceharddrive.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: deviceharddrive.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/deviceharddrive.php glpi-0.80.7/front/deviceharddrive.php
--- glpi-0.80.5/front/deviceharddrive.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/deviceharddrive.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: deviceharddrive.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: deviceharddrive.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicememory.form.php glpi-0.80.7/front/devicememory.form.php
--- glpi-0.80.5/front/devicememory.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicememory.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicememory.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicememory.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicememory.php glpi-0.80.7/front/devicememory.php
--- glpi-0.80.5/front/devicememory.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicememory.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicememory.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicememory.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicememorytype.form.php glpi-0.80.7/front/devicememorytype.form.php
--- glpi-0.80.5/front/devicememorytype.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicememorytype.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicememorytype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicememorytype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicememorytype.php glpi-0.80.7/front/devicememorytype.php
--- glpi-0.80.5/front/devicememorytype.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicememorytype.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicememorytype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicememorytype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicemotherboard.form.php glpi-0.80.7/front/devicemotherboard.form.php
--- glpi-0.80.5/front/devicemotherboard.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicemotherboard.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicemotherboard.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicemotherboard.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicemotherboard.php glpi-0.80.7/front/devicemotherboard.php
--- glpi-0.80.5/front/devicemotherboard.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicemotherboard.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicemotherboard.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicemotherboard.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicenetworkcard.form.php glpi-0.80.7/front/devicenetworkcard.form.php
--- glpi-0.80.5/front/devicenetworkcard.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicenetworkcard.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicenetworkcard.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicenetworkcard.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicenetworkcard.php glpi-0.80.7/front/devicenetworkcard.php
--- glpi-0.80.5/front/devicenetworkcard.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicenetworkcard.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicenetworkcard.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicenetworkcard.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicepci.form.php glpi-0.80.7/front/devicepci.form.php
--- glpi-0.80.5/front/devicepci.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicepci.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicepci.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicepci.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicepci.php glpi-0.80.7/front/devicepci.php
--- glpi-0.80.5/front/devicepci.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicepci.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicepci.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicepci.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/device.php glpi-0.80.7/front/device.php
--- glpi-0.80.5/front/device.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/device.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: device.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: device.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicepowersupply.form.php glpi-0.80.7/front/devicepowersupply.form.php
--- glpi-0.80.5/front/devicepowersupply.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicepowersupply.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicepowersupply.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicepowersupply.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicepowersupply.php glpi-0.80.7/front/devicepowersupply.php
--- glpi-0.80.5/front/devicepowersupply.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicepowersupply.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicepowersupply.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicepowersupply.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/deviceprocessor.form.php glpi-0.80.7/front/deviceprocessor.form.php
--- glpi-0.80.5/front/deviceprocessor.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/deviceprocessor.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: deviceprocessor.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: deviceprocessor.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/deviceprocessor.php glpi-0.80.7/front/deviceprocessor.php
--- glpi-0.80.5/front/deviceprocessor.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/deviceprocessor.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: deviceprocessor.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: deviceprocessor.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicesoundcard.form.php glpi-0.80.7/front/devicesoundcard.form.php
--- glpi-0.80.5/front/devicesoundcard.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicesoundcard.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicesoundcard.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicesoundcard.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/devicesoundcard.php glpi-0.80.7/front/devicesoundcard.php
--- glpi-0.80.5/front/devicesoundcard.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/devicesoundcard.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: devicesoundcard.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicesoundcard.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/dictionnary.php glpi-0.80.7/front/dictionnary.php
--- glpi-0.80.5/front/dictionnary.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/dictionnary.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dictionnary.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: dictionnary.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/displaypreference.form.php glpi-0.80.7/front/displaypreference.form.php
--- glpi-0.80.5/front/displaypreference.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/displaypreference.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: displaypreference.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: displaypreference.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/documentcategory.form.php glpi-0.80.7/front/documentcategory.form.php
--- glpi-0.80.5/front/documentcategory.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/documentcategory.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: documentcategory.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: documentcategory.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/documentcategory.php glpi-0.80.7/front/documentcategory.php
--- glpi-0.80.5/front/documentcategory.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/documentcategory.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: documentcategory.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: documentcategory.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/document.form.php glpi-0.80.7/front/document.form.php
--- glpi-0.80.5/front/document.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/document.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: document.form.php 15821 2011-10-03 07:55:24Z remi $
+ * @version $Id: document.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/document.php glpi-0.80.7/front/document.php
--- glpi-0.80.5/front/document.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/document.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: document.php 15453 2011-08-22 10:12:56Z yllen $
+ * @version $Id: document.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/document.send.php glpi-0.80.7/front/document.send.php
--- glpi-0.80.5/front/document.send.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/document.send.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: document.send.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: document.send.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/documenttype.form.php glpi-0.80.7/front/documenttype.form.php
--- glpi-0.80.5/front/documenttype.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/documenttype.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: documenttype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: documenttype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/documenttype.list.php glpi-0.80.7/front/documenttype.list.php
--- glpi-0.80.5/front/documenttype.list.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/documenttype.list.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: documenttype.list.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: documenttype.list.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/documenttype.php glpi-0.80.7/front/documenttype.php
--- glpi-0.80.5/front/documenttype.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/documenttype.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: documenttype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: documenttype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/domain.form.php glpi-0.80.7/front/domain.form.php
--- glpi-0.80.5/front/domain.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/domain.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: domain.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: domain.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/domain.php glpi-0.80.7/front/domain.php
--- glpi-0.80.5/front/domain.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/domain.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: domain.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: domain.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/dropdown.common.form.php glpi-0.80.7/front/dropdown.common.form.php
--- glpi-0.80.5/front/dropdown.common.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/dropdown.common.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdown.common.form.php 15453 2011-08-22 10:12:56Z yllen $
+ * @version $Id: dropdown.common.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/dropdown.common.php glpi-0.80.7/front/dropdown.common.php
--- glpi-0.80.5/front/dropdown.common.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/dropdown.common.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdown.common.php 15453 2011-08-22 10:12:56Z yllen $
+ * @version $Id: dropdown.common.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/dropdown.php glpi-0.80.7/front/dropdown.php
--- glpi-0.80.5/front/dropdown.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/dropdown.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdown.php 15472 2011-08-23 12:05:01Z yllen $
+ * @version $Id: dropdown.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/entitydata.form.php glpi-0.80.7/front/entitydata.form.php
--- glpi-0.80.5/front/entitydata.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/entitydata.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: entitydata.form.php 15454 2011-08-22 12:06:24Z yllen $
+ * @version $Id: entitydata.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/entity.form.php glpi-0.80.7/front/entity.form.php
--- glpi-0.80.5/front/entity.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/entity.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: entity.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: entity.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/entitynotification.form.php glpi-0.80.7/front/entitynotification.form.php
--- glpi-0.80.5/front/entitynotification.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/entitynotification.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: entitynotification.form.php 15454 2011-08-22 12:06:24Z yllen $
+ * @version $Id: entitynotification.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/entity.php glpi-0.80.7/front/entity.php
--- glpi-0.80.5/front/entity.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/entity.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: entity.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: entity.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/event.php glpi-0.80.7/front/event.php
--- glpi-0.80.5/front/event.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/event.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: event.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: event.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/fieldblacklist.form.php glpi-0.80.7/front/fieldblacklist.form.php
--- glpi-0.80.5/front/fieldblacklist.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/fieldblacklist.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: fieldblacklist.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: fieldblacklist.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/fieldblacklist.php glpi-0.80.7/front/fieldblacklist.php
--- glpi-0.80.5/front/fieldblacklist.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/fieldblacklist.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: fieldblacklist.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: fieldblacklist.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/fieldunicity.form.php glpi-0.80.7/front/fieldunicity.form.php
--- glpi-0.80.5/front/fieldunicity.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/fieldunicity.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: fieldunicity.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: fieldunicity.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/fieldunicity.php glpi-0.80.7/front/fieldunicity.php
--- glpi-0.80.5/front/fieldunicity.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/fieldunicity.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: fieldunicity.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: fieldunicity.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/filesystem.form.php glpi-0.80.7/front/filesystem.form.php
--- glpi-0.80.5/front/filesystem.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/filesystem.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: filesystem.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: filesystem.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/filesystem.php glpi-0.80.7/front/filesystem.php
--- glpi-0.80.5/front/filesystem.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/filesystem.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: filesystem.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: filesystem.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/find_num.php glpi-0.80.7/front/find_num.php
--- glpi-0.80.5/front/find_num.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/find_num.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: find_num.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: find_num.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/graph.send.php glpi-0.80.7/front/graph.send.php
--- glpi-0.80.5/front/graph.send.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/graph.send.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: graph.send.php 15472 2011-08-23 12:05:01Z yllen $
+ * @version $Id: graph.send.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/group.form.php glpi-0.80.7/front/group.form.php
--- glpi-0.80.5/front/group.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/group.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: group.form.php 15454 2011-08-22 12:06:24Z yllen $
+ * @version $Id: group.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/group.php glpi-0.80.7/front/group.php
--- glpi-0.80.5/front/group.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/group.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: group.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: group.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/helpdesk.faq.php glpi-0.80.7/front/helpdesk.faq.php
--- glpi-0.80.5/front/helpdesk.faq.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/helpdesk.faq.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: helpdesk.faq.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: helpdesk.faq.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/helpdesk.public.php glpi-0.80.7/front/helpdesk.public.php
--- glpi-0.80.5/front/helpdesk.public.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/helpdesk.public.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: helpdesk.public.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: helpdesk.public.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/holiday.form.php glpi-0.80.7/front/holiday.form.php
--- glpi-0.80.5/front/holiday.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/holiday.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: holiday.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: holiday.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/holiday.php glpi-0.80.7/front/holiday.php
--- glpi-0.80.5/front/holiday.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/holiday.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: holiday.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: holiday.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/index.php glpi-0.80.7/front/index.php
--- glpi-0.80.5/front/index.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/index.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: index.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: index.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/infocom.form.php glpi-0.80.7/front/infocom.form.php
--- glpi-0.80.5/front/infocom.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/infocom.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: infocom.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: infocom.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/interfacetype.form.php glpi-0.80.7/front/interfacetype.form.php
--- glpi-0.80.5/front/interfacetype.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/interfacetype.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: interfacetype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: interfacetype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/interfacetype.php glpi-0.80.7/front/interfacetype.php
--- glpi-0.80.5/front/interfacetype.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/interfacetype.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: interfacetype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: interfacetype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/knowbaseitemcategory.form.php glpi-0.80.7/front/knowbaseitemcategory.form.php
--- glpi-0.80.5/front/knowbaseitemcategory.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/knowbaseitemcategory.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: knowbaseitemcategory.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: knowbaseitemcategory.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/knowbaseitemcategory.php glpi-0.80.7/front/knowbaseitemcategory.php
--- glpi-0.80.5/front/knowbaseitemcategory.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/knowbaseitemcategory.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: knowbaseitemcategory.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: knowbaseitemcategory.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/knowbaseitem.form.php glpi-0.80.7/front/knowbaseitem.form.php
--- glpi-0.80.5/front/knowbaseitem.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/knowbaseitem.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: knowbaseitem.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: knowbaseitem.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/knowbaseitem.php glpi-0.80.7/front/knowbaseitem.php
--- glpi-0.80.5/front/knowbaseitem.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/knowbaseitem.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: knowbaseitem.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: knowbaseitem.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/ldap.group.import.php glpi-0.80.7/front/ldap.group.import.php
--- glpi-0.80.5/front/ldap.group.import.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ldap.group.import.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ldap.group.import.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ldap.group.import.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/ldap.group.php glpi-0.80.7/front/ldap.group.php
--- glpi-0.80.5/front/ldap.group.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ldap.group.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ldap.group.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ldap.group.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/ldap.import.php glpi-0.80.7/front/ldap.import.php
--- glpi-0.80.5/front/ldap.import.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ldap.import.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ldap.import.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ldap.import.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/ldap.php glpi-0.80.7/front/ldap.php
--- glpi-0.80.5/front/ldap.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ldap.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ldap.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ldap.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/link.form.php glpi-0.80.7/front/link.form.php
--- glpi-0.80.5/front/link.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/link.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: link.form.php 15454 2011-08-22 12:06:24Z yllen $
+ * @version $Id: link.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/link_itemtype.form.php glpi-0.80.7/front/link_itemtype.form.php
--- glpi-0.80.5/front/link_itemtype.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/link_itemtype.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: link_itemtype.form.php 15454 2011-08-22 12:06:24Z yllen $
+ * @version $Id: link_itemtype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/link.php glpi-0.80.7/front/link.php
--- glpi-0.80.5/front/link.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/link.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: link.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: link.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/link.send.php glpi-0.80.7/front/link.send.php
--- glpi-0.80.5/front/link.send.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/link.send.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: link.send.php 15558 2011-08-30 14:51:30Z remi $
+ * @version $Id: link.send.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/location.form.php glpi-0.80.7/front/location.form.php
--- glpi-0.80.5/front/location.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/location.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: location.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: location.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/location.php glpi-0.80.7/front/location.php
--- glpi-0.80.5/front/location.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/location.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: location.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: location.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/lostpassword.php glpi-0.80.7/front/lostpassword.php
--- glpi-0.80.5/front/lostpassword.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/lostpassword.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: lostpassword.php 15238 2011-08-06 11:28:26Z remi $
+ * @version $Id: lostpassword.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/mailcollector.form.php glpi-0.80.7/front/mailcollector.form.php
--- glpi-0.80.5/front/mailcollector.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/mailcollector.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: mailcollector.form.php 15454 2011-08-22 12:06:24Z yllen $
+ * @version $Id: mailcollector.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/mailcollector.php glpi-0.80.7/front/mailcollector.php
--- glpi-0.80.5/front/mailcollector.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/mailcollector.php	2012-02-09 20:24:12.000000000 +0000
@@ -2,10 +2,10 @@
 
 
 /*
- * @version $Id: mailcollector.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: mailcollector.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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/manufacturer.form.php glpi-0.80.7/front/manufacturer.form.php
--- glpi-0.80.5/front/manufacturer.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/manufacturer.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: manufacturer.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: manufacturer.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/manufacturer.php glpi-0.80.7/front/manufacturer.php
--- glpi-0.80.5/front/manufacturer.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/manufacturer.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: manufacturer.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: manufacturer.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/massiveaction.php glpi-0.80.7/front/massiveaction.php
--- glpi-0.80.5/front/massiveaction.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/massiveaction.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: massiveaction.php 15844 2011-10-10 08:35:08Z yllen $
+ * @version $Id: massiveaction.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -701,11 +700,11 @@
                      $input = addslashes_deep($input);
                      // Import new
                      $newid = $item->import($input);
-
+                     // delete with purge for dropwn with trash (Budget)
                      // Delete old
                      if ($newid > 0) {
                         $item->delete(array('id'          => $key,
-                                            '_replace_by' => $newid));
+                                            '_replace_by' => $newid), 1);
                      }
                   }
                }
diff -Nru glpi-0.80.5/front/monitor.form.php glpi-0.80.7/front/monitor.form.php
--- glpi-0.80.5/front/monitor.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/monitor.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: monitor.form.php 15454 2011-08-22 12:06:24Z yllen $
+ * @version $Id: monitor.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/monitormodel.form.php glpi-0.80.7/front/monitormodel.form.php
--- glpi-0.80.5/front/monitormodel.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/monitormodel.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: monitormodel.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: monitormodel.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/monitormodel.php glpi-0.80.7/front/monitormodel.php
--- glpi-0.80.5/front/monitormodel.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/monitormodel.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: monitormodel.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: monitormodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/monitor.php glpi-0.80.7/front/monitor.php
--- glpi-0.80.5/front/monitor.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/monitor.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: monitor.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: monitor.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/monitortype.form.php glpi-0.80.7/front/monitortype.form.php
--- glpi-0.80.5/front/monitortype.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/monitortype.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: monitortype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: monitortype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/monitortype.php glpi-0.80.7/front/monitortype.php
--- glpi-0.80.5/front/monitortype.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/monitortype.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: monitortype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: monitortype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/netpoint.form.php glpi-0.80.7/front/netpoint.form.php
--- glpi-0.80.5/front/netpoint.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/netpoint.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: netpoint.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: netpoint.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/netpoint.php glpi-0.80.7/front/netpoint.php
--- glpi-0.80.5/front/netpoint.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/netpoint.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: netpoint.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: netpoint.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/networkequipmentfirmware.form.php glpi-0.80.7/front/networkequipmentfirmware.form.php
--- glpi-0.80.5/front/networkequipmentfirmware.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/networkequipmentfirmware.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkequipmentfirmware.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkequipmentfirmware.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/networkequipmentfirmware.php glpi-0.80.7/front/networkequipmentfirmware.php
--- glpi-0.80.5/front/networkequipmentfirmware.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/networkequipmentfirmware.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkequipmentfirmware.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkequipmentfirmware.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/networkequipment.form.php glpi-0.80.7/front/networkequipment.form.php
--- glpi-0.80.5/front/networkequipment.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/networkequipment.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkequipment.form.php 15454 2011-08-22 12:06:24Z yllen $
+ * @version $Id: networkequipment.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/networkequipmentmodel.form.php glpi-0.80.7/front/networkequipmentmodel.form.php
--- glpi-0.80.5/front/networkequipmentmodel.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/networkequipmentmodel.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkequipmentmodel.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkequipmentmodel.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/networkequipmentmodel.php glpi-0.80.7/front/networkequipmentmodel.php
--- glpi-0.80.5/front/networkequipmentmodel.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/networkequipmentmodel.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkequipmentmodel.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkequipmentmodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/networkequipment.php glpi-0.80.7/front/networkequipment.php
--- glpi-0.80.5/front/networkequipment.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/networkequipment.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkequipment.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkequipment.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/networkequipmenttype.form.php glpi-0.80.7/front/networkequipmenttype.form.php
--- glpi-0.80.5/front/networkequipmenttype.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/networkequipmenttype.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkequipmenttype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkequipmenttype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/networkequipmenttype.php glpi-0.80.7/front/networkequipmenttype.php
--- glpi-0.80.5/front/networkequipmenttype.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/networkequipmenttype.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkequipmenttype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkequipmenttype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/network.form.php glpi-0.80.7/front/network.form.php
--- glpi-0.80.5/front/network.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/network.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: network.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: network.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/networkinterface.form.php glpi-0.80.7/front/networkinterface.form.php
--- glpi-0.80.5/front/networkinterface.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/networkinterface.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkinterface.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkinterface.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/networkinterface.php glpi-0.80.7/front/networkinterface.php
--- glpi-0.80.5/front/networkinterface.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/networkinterface.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkinterface.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkinterface.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/network.php glpi-0.80.7/front/network.php
--- glpi-0.80.5/front/network.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/network.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: network.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: network.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/networkport.form.php glpi-0.80.7/front/networkport.form.php
--- glpi-0.80.5/front/networkport.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/networkport.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkport.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkport.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/notification.form.php glpi-0.80.7/front/notification.form.php
--- glpi-0.80.5/front/notification.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/notification.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notification.form.php 15454 2011-08-22 12:06:24Z yllen $
+ * @version $Id: notification.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/notificationmailsetting.form.php glpi-0.80.7/front/notificationmailsetting.form.php
--- glpi-0.80.5/front/notificationmailsetting.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/notificationmailsetting.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationmailsetting.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notificationmailsetting.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/notification.php glpi-0.80.7/front/notification.php
--- glpi-0.80.5/front/notification.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/notification.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notification.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notification.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/notification.tags.php glpi-0.80.7/front/notification.tags.php
--- glpi-0.80.5/front/notification.tags.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/notification.tags.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notification.tags.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notification.tags.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/notificationtarget.form.php glpi-0.80.7/front/notificationtarget.form.php
--- glpi-0.80.5/front/notificationtarget.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/notificationtarget.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationtarget.form.php 15454 2011-08-22 12:06:24Z yllen $
+ * @version $Id: notificationtarget.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/notificationtemplate.form.php glpi-0.80.7/front/notificationtemplate.form.php
--- glpi-0.80.5/front/notificationtemplate.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/notificationtemplate.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationtemplate.form.php 15454 2011-08-22 12:06:24Z yllen $
+ * @version $Id: notificationtemplate.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/notificationtemplate.php glpi-0.80.7/front/notificationtemplate.php
--- glpi-0.80.5/front/notificationtemplate.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/notificationtemplate.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationtemplate.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notificationtemplate.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/notificationtemplatetranslation.form.php glpi-0.80.7/front/notificationtemplatetranslation.form.php
--- glpi-0.80.5/front/notificationtemplatetranslation.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/notificationtemplatetranslation.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationtemplatetranslation.form.php 15454 2011-08-22 12:06:24Z yllen $
+ * @version $Id: notificationtemplatetranslation.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/notimportedemail.php glpi-0.80.7/front/notimportedemail.php
--- glpi-0.80.5/front/notimportedemail.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/notimportedemail.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notimportedemail.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notimportedemail.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/ocsng.clean.php glpi-0.80.7/front/ocsng.clean.php
--- glpi-0.80.5/front/ocsng.clean.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ocsng.clean.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ocsng.clean.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ocsng.clean.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/ocsng.import.php glpi-0.80.7/front/ocsng.import.php
--- glpi-0.80.5/front/ocsng.import.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ocsng.import.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ocsng.import.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ocsng.import.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/ocsng.link.php glpi-0.80.7/front/ocsng.link.php
--- glpi-0.80.5/front/ocsng.link.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ocsng.link.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ocsng.link.php 14876 2011-07-08 08:03:43Z moyo $
+ * @version $Id: ocsng.link.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/ocsng.php glpi-0.80.7/front/ocsng.php
--- glpi-0.80.5/front/ocsng.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ocsng.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: ocsng.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ocsng.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/ocsng.sync.php glpi-0.80.7/front/ocsng.sync.php
--- glpi-0.80.5/front/ocsng.sync.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ocsng.sync.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ocsng.sync.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ocsng.sync.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/ocsserver.form.php glpi-0.80.7/front/ocsserver.form.php
--- glpi-0.80.5/front/ocsserver.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ocsserver.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: ocsserver.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ocsserver.form.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/ocsserver.php glpi-0.80.7/front/ocsserver.php
--- glpi-0.80.5/front/ocsserver.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/ocsserver.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: ocsserver.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ocsserver.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/operatingsystem.form.php glpi-0.80.7/front/operatingsystem.form.php
--- glpi-0.80.5/front/operatingsystem.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/operatingsystem.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: operatingsystem.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: operatingsystem.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/operatingsystem.php glpi-0.80.7/front/operatingsystem.php
--- glpi-0.80.5/front/operatingsystem.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/operatingsystem.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: operatingsystem.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: operatingsystem.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/operatingsystemservicepack.form.php glpi-0.80.7/front/operatingsystemservicepack.form.php
--- glpi-0.80.5/front/operatingsystemservicepack.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/operatingsystemservicepack.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: operatingsystemservicepack.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: operatingsystemservicepack.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/operatingsystemservicepack.php glpi-0.80.7/front/operatingsystemservicepack.php
--- glpi-0.80.5/front/operatingsystemservicepack.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/operatingsystemservicepack.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: operatingsystemservicepack.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: operatingsystemservicepack.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/operatingsystemversion.form.php glpi-0.80.7/front/operatingsystemversion.form.php
--- glpi-0.80.5/front/operatingsystemversion.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/operatingsystemversion.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: operatingsystemversion.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: operatingsystemversion.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/operatingsystemversion.php glpi-0.80.7/front/operatingsystemversion.php
--- glpi-0.80.5/front/operatingsystemversion.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/operatingsystemversion.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: operatingsystemversion.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: operatingsystemversion.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/peripheral.form.php glpi-0.80.7/front/peripheral.form.php
--- glpi-0.80.5/front/peripheral.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/peripheral.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: peripheral.form.php 15455 2011-08-22 12:40:30Z yllen $
+ * @version $Id: peripheral.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/peripheralmodel.form.php glpi-0.80.7/front/peripheralmodel.form.php
--- glpi-0.80.5/front/peripheralmodel.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/peripheralmodel.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: peripheralmodel.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: peripheralmodel.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/peripheralmodel.php glpi-0.80.7/front/peripheralmodel.php
--- glpi-0.80.5/front/peripheralmodel.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/peripheralmodel.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: peripheralmodel.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: peripheralmodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/peripheral.php glpi-0.80.7/front/peripheral.php
--- glpi-0.80.5/front/peripheral.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/peripheral.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: peripheral.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: peripheral.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/peripheraltype.form.php glpi-0.80.7/front/peripheraltype.form.php
--- glpi-0.80.5/front/peripheraltype.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/peripheraltype.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: peripheraltype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: peripheraltype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/peripheraltype.php glpi-0.80.7/front/peripheraltype.php
--- glpi-0.80.5/front/peripheraltype.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/peripheraltype.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: peripheraltype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: peripheraltype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/phone.form.php glpi-0.80.7/front/phone.form.php
--- glpi-0.80.5/front/phone.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/phone.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: phone.form.php 15455 2011-08-22 12:40:30Z yllen $
+ * @version $Id: phone.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/phonemodel.form.php glpi-0.80.7/front/phonemodel.form.php
--- glpi-0.80.5/front/phonemodel.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/phonemodel.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: phonemodel.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: phonemodel.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/phonemodel.php glpi-0.80.7/front/phonemodel.php
--- glpi-0.80.5/front/phonemodel.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/phonemodel.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: phonemodel.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: phonemodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/phone.php glpi-0.80.7/front/phone.php
--- glpi-0.80.5/front/phone.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/phone.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: phone.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: phone.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/phonepowersupply.form.php glpi-0.80.7/front/phonepowersupply.form.php
--- glpi-0.80.5/front/phonepowersupply.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/phonepowersupply.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: phonepowersupply.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: phonepowersupply.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/phonepowersupply.php glpi-0.80.7/front/phonepowersupply.php
--- glpi-0.80.5/front/phonepowersupply.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/phonepowersupply.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: phonepowersupply.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: phonepowersupply.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/phonetype.form.php glpi-0.80.7/front/phonetype.form.php
--- glpi-0.80.5/front/phonetype.form.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/phonetype.form.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: phonetype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: phonetype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/phonetype.php glpi-0.80.7/front/phonetype.php
--- glpi-0.80.5/front/phonetype.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/phonetype.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: phonetype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: phonetype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/planning.php glpi-0.80.7/front/planning.php
--- glpi-0.80.5/front/planning.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/planning.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: planning.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: planning.php 17158 2012-01-24 12:15:22Z 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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -64,6 +63,7 @@
 
    case "user_group" :
       $_GET['gID'] = "mine";
+      $_GET['uID'] = getLoginUserID();      
       break;
 }
 
diff -Nru glpi-0.80.5/front/pluginimage.send.php glpi-0.80.7/front/pluginimage.send.php
--- glpi-0.80.5/front/pluginimage.send.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/pluginimage.send.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: pluginimage.send.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: pluginimage.send.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/plugin.php glpi-0.80.7/front/plugin.php
--- glpi-0.80.5/front/plugin.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/plugin.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: plugin.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: plugin.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/front/popup.php glpi-0.80.7/front/popup.php
--- glpi-0.80.5/front/popup.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/front/popup.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: popup.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: popup.php 17457 2012-02-09 15:26:40Z 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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -92,11 +91,6 @@
          include "ldap.import.php";
          break;
 
-      case "add_ruleparameter" :
-         popHeader($LANG['ldap'][35], $_SERVER['PHP_SELF']);
-         include strtolower($_GET['sub_type']."Parameter.php");
-         break;
-
       case "list_notificationtags" :
          popHeader($LANG['mailing'][138], $_SERVER['PHP_SELF']);
          include "notification.tags.php";
@@ -107,7 +101,6 @@
          $kb = new KnowbaseItem;
          $kb->check($_GET["id"],'r');
          $kb->showFull(true);
-         popHeader($LANG['mailing'][138], $_SERVER['PHP_SELF']);
          break;
    }
    echo "<div class='center'><br><a href='javascript:window.close()'>".$LANG['buttons'][60]."</a>";
@@ -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 @@
 <?php
 
 /*
- * @version $Id: preference.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: preference.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: printer.form.php 15455 2011-08-22 12:40:30Z yllen $
+ * @version $Id: printer.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: printermodel.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: printermodel.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: printermodel.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: printermodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: printer.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: printer.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: printertype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: printertype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: printertype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: printertype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: profile.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: profile.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: profile.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: profile.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: profile_user.form.php 15455 2011-08-22 12:40:30Z yllen $
+ * @version $Id: profile_user.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: reminder.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: reminder.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: reminder.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: reminder.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: report.contract.list.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: report.contract.list.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: report.contract.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: report.contract.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: report.default.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: report.default.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: report.dynamic.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: report.dynamic.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: report.infocom.conso.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: report.infocom.conso.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: report.infocom.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: report.infocom.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: report.location.list.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: report.location.list.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: report.netpoint.list.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: report.netpoint.list.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 /*!
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 @@
 <?php
 /*
- * @version $Id: report.networking.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: report.networking.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 /*!
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 @@
 <?php
 /*
- * @version $Id: report.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: report.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: report.reservation.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: report.reservation.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: report.switch.list.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: report.switch.list.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 /*!
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 @@
 <?php
 /*
- * @version $Id: report.year.list.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: report.year.list.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: report.year.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: report.year.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: requesttype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: requesttype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: requesttype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: requesttype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: reservation.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: reservation.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -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 @@
 <?php
 /*
- * @version $Id: reservationitem.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: reservationitem.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: reservationitem.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: reservationitem.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: reservation.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: reservation.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: rule.cache.php 15455 2011-08-22 12:40:30Z yllen $
+ * @version $Id: rule.cache.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: rule.common.form.php 15096 2011-07-28 14:22:22Z remi $
+ * @version $Id: rule.common.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: rule.common.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rule.common.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarycomputermodel.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarycomputermodel.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarycomputermodel.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarycomputermodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarycomputertype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarycomputertype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarycomputertype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarycomputertype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarymanufacturer.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarymanufacturer.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarymanufacturer.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarymanufacturer.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarymonitormodel.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarymonitormodel.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarymonitormodel.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarymonitormodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarymonitortype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarymonitortype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarymonitortype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarymonitortype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarynetworkequipmentmodel.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarynetworkequipmentmodel.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarynetworkequipmentmodel.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarynetworkequipmentmodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarynetworkequipmenttype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarynetworkequipmenttype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarynetworkequipmenttype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarynetworkequipmenttype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryoperatingsystem.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryoperatingsystem.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryoperatingsystem.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryoperatingsystem.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryoperatingsystemservicepack.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryoperatingsystemservicepack.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryoperatingsystemservicepack.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryoperatingsystemservicepack.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryoperatingsystemversion.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryoperatingsystemversion.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryoperatingsystemversion.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryoperatingsystemversion.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryperipheralmodel.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryperipheralmodel.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryperipheralmodel.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryperipheralmodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryperipheraltype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryperipheraltype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryperipheraltype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryperipheraltype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryphonemodel.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryphonemodel.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryphonemodel.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryphonemodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryphonetype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryphonetype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryphonetype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryphonetype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryprinter.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryprinter.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryprintermodel.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryprintermodel.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryprintermodel.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryprintermodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryprinter.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryprinter.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryprintertype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryprintertype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryprintertype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryprintertype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarysoftware.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarysoftware.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarysoftware.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarysoftware.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: rule.generic.form.php 15455 2011-08-22 12:40:30Z yllen $
+ * @version $Id: rule.generic.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruleimportcomputer.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruleimportcomputer.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruleimportcomputer.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruleimportcomputer.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: rulemailcollector.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rulemailcollector.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: rulemailcollector.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rulemailcollector.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruleocs.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruleocs.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruleocs.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruleocs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: rule.php 15455 2011-08-22 12:40:30Z yllen $
+ * @version $Id: rule.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruleright.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruleright.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: rulerightparameter.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rulerightparameter.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: rulerightparameter.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rulerightparameter.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruleright.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruleright.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: rulesengine.test.php 15455 2011-08-22 12:40:30Z yllen $
+ * @version $Id: rulesengine.test.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: rulesoftwarecategory.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rulesoftwarecategory.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: rulesoftwarecategory.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rulesoftwarecategory.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: rule.test.php 15455 2011-08-22 12:40:30Z yllen $
+ * @version $Id: rule.test.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruleticket.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruleticket.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruleticket.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruleticket.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: setup.auth.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: setup.auth.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: setup.notification.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: setup.notification.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: setup.templates.php 15455 2011-08-22 12:40:30Z yllen $
+ * @version $Id: setup.templates.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: sla.form.php 15455 2011-08-22 12:40:30Z yllen $
+ * @version $Id: sla.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: slalevel.form.php 14754 2011-06-23 13:48:01Z moyo $
+ * @version $Id: slalevel.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: sla.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: sla.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: softwarecategory.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: softwarecategory.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: softwarecategory.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: softwarecategory.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: software.form.php 15455 2011-08-22 12:40:30Z yllen $
+ * @version $Id: software.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: softwarelicense.form.php 15455 2011-08-22 12:40:30Z yllen $
+ * @version $Id: softwarelicense.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: softwarelicensetype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: softwarelicensetype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: softwarelicensetype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: softwarelicensetype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: software.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: software.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: softwareversion.form.php 15455 2011-08-22 12:40:30Z yllen $
+ * @version $Id: softwareversion.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: state.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: state.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: state.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: state.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: states.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: states.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: stat.global.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: stat.global.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: stat.graph.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: stat.graph.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -197,7 +196,7 @@
       $next  = $prev = 0;
       $next  = getNextItem("glpi_ticketsolutiontypes", $_GET["id"]);
       $prev  = getPreviousItem("glpi_ticketsolutiontypes", $_GET["id"]);
-      $title = $LANG['users'][1]."&nbsp;: ".Dropdown::getDropdownName("glpi_ticketsolutiontypes",
+      $title = $LANG['job'][48]."&nbsp;: ".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 @@
 <?php
 /*
- * @version $Id: stat.item.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: stat.item.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: stat.location.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: stat.location.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: stat.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: stat.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: stat.tracking.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: stat.tracking.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: supplier.form.php 15455 2011-08-22 12:40:30Z yllen $
+ * @version $Id: supplier.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: supplier.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: supplier.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: suppliertype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: suppliertype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: suppliertype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: suppliertype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: taskcategory.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: taskcategory.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: taskcategory.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: taskcategory.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ticketcategory.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ticketcategory.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ticketcategory.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ticketcategory.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ticketfollowup.form.php 15712 2011-09-20 08:45:12Z moyo $
+ * @version $Id: ticketfollowup.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ticket.form.php 15555 2011-08-30 14:18:20Z moyo $
+ * @version $Id: ticket.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ticket.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ticket.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ticketsatisfaction.form.php 15786 2011-09-27 09:31:53Z yllen $
+ * @version $Id: ticketsatisfaction.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ticketsolutiontemplate.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ticketsolutiontemplate.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ticketsolutiontemplate.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ticketsolutiontemplate.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ticketsolutiontype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ticketsolutiontype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ticketsolutiontype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ticketsolutiontype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: tickettask.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: tickettask.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ticket_user.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ticket_user.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ticketvalidation.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ticketvalidation.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
 */
 
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 @@
 <?php
 /*
- * @version $Id: tracking.injector.php 15665 2011-09-13 06:53:57Z moyo $
+ * @version $Id: tracking.injector.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: transfer.action.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: transfer.action.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: transfer.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: transfer.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: transfer.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: transfer.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: usercategory.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: usercategory.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: usercategory.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: usercategory.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: user.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: user.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: user.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: user.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: usertitle.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: usertitle.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: usertitle.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: usertitle.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: virtualmachinestate.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: virtualmachinestate.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: virtualmachinestate.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: virtualmachinestate.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: virtualmachinesystem.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: virtualmachinesystem.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: virtualmachinesystem.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: virtualmachinesystem.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: virtualmachinetype.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: virtualmachinetype.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: virtualmachinetype.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: virtualmachinetype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: vlan.form.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: vlan.form.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: vlan.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: vlan.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ajax.function.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ajax.function.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: alert.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: alert.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: auth.class.php 15771 2011-09-27 06:39:53Z moyo $
+ * @version $Id: auth.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 
 /*
- * @version $Id: auth.function.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: auth.function.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: authldap.class.php 15876 2011-10-18 09:53:53Z remi $
+ * @version $Id: authldap.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: authldapreplicate.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: authldapreplicate.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: authmail.class.php 15057 2011-07-27 13:31:33Z remi $
+ * @version $Id: authmail.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: autoupdatesystem.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: autoupdatesystem.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 
 /*
- * @version $Id: bookmark.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: bookmark.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 
 /*
- * @version $Id: bookmark_user.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: bookmark_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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 
 /*
- * @version $Id: budget.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: budget.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: calendar.class.php 15866 2011-10-18 07:46:23Z moyo $
+ * @version $Id: calendar.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: calendar_holiday.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: calendar_holiday.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: calendarsegment.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: calendarsegment.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: cartridge.class.php 14798 2011-06-28 12:17:31Z moyo $
+ * @version $Id: cartridge.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: cartridgeitem.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: cartridgeitem.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: cartridgeitemtype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: cartridgeitemtype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: central.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: central.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: commondbchild.class.php 15195 2011-08-03 08:49:18Z remi $
+ * @version $Id: commondbchild.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: commondbrelation.class.php 15195 2011-08-03 08:49:18Z remi $
+ * @version $Id: commondbrelation.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: commondbtm.class.php 15774 2011-09-27 06:50:43Z moyo $
+ * @version $Id: commondbtm.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -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 @@
 <?php
 /*
- * @version $Id: commondevice.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: commondevice.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: commondropdown.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: commondropdown.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: common.function.php 15517 2011-08-29 07:54:35Z yllen $
+ * @version $Id: common.function.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -1203,13 +1202,13 @@
    // Display : clean display
    switch ($_SESSION['glpinumber_format']) {
       case 2 : // Other French
-         return str_replace(' ', '&nbsp;', number_format($number, $decimal, ', ', ' '));
+         return str_replace(' ', '&nbsp;', number_format($number, $decimal, ',', ' '));
 
       case 0 : // French
          return str_replace(' ', '&nbsp;', 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 @@
 <?php
 /*
- * @version $Id: commonglpi.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: commonglpi.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: commontreedropdown.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: commontreedropdown.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -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 @@
 <?php
 /*
- * @version $Id: computer.class.php 15519 2011-08-30 06:32:24Z moyo $
+ * @version $Id: computer.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: computer_device.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: computer_device.class.php 17448 2012-02-08 09:52:32Z tsmr $
  -------------------------------------------------------------------------
  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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -239,7 +238,7 @@
             if ($device->getFromDB($data[$fk])) {
                echo "<tr class='tab_bg_2'>";
                echo "<td class='center'>";
-               Dropdown::showInteger("quantity_".$itemtype."_".$data['id'], $data['NB']);
+               Dropdown::showInteger("quantity_".$itemtype."_".$data['id'], $data['NB'],0,300);
                echo "</td><td>";
                if ($device->canCreate()) {
                   echo "<a href='".$device->getSearchURL()."'>".$device->getTypeName()."</a>";
@@ -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 @@
 <?php
 /*
- * @version $Id: computerdisk.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: computerdisk.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: computer_item.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: computer_item.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: computermodel.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: computermodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: computer_softwarelicense.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: computer_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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: computer_softwareversion.class.php 15512 2011-08-29 07:24:31Z yllen $
+ * @version $Id: computer_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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: computertype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: computertype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: computervirtualmachine.class.php 15818 2011-10-01 17:57:53Z remi $
+ * @version $Id: computervirtualmachine.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: config.class.php 15736 2011-09-21 19:32:47Z moyo $
+ * @version $Id: config.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: consumable.class.php 14798 2011-06-28 12:17:31Z moyo $
+ * @version $Id: consumable.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: consumableitem.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: consumableitem.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: consumableitemtype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: consumableitemtype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: contact.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: contact.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: contact_supplier.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: contact_supplier.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: contacttype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: contacttype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: contract.class.php 15081 2011-07-28 10:48:27Z moyo $
+ * @version $Id: contract.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -826,7 +825,9 @@
       echo "<th>".$LANG['entity'][0]."</th>";
       echo "<th>".$LANG['common'][16]."</th>";
       echo "<th>".$LANG['common'][19]."</th>";
-      echo "<th>".$LANG['common'][20]."</th></tr>";
+      echo "<th>".$LANG['common'][20]."</th>";
+      echo "<th>".$LANG['state'][0]."</th>";      
+      echo "</tr>";
 
       $totalnb = 0;
       for ($i=0 ; $i<$number ; $i++) {
@@ -904,7 +905,13 @@
                          (isset($data["serial"])? "".$data["serial"]."" :"-")."</td>";
                   echo "<td class='center'>".
                          (isset($data["otherserial"])? "".$data["otherserial"]."" :"-")."</td>";
-                  echo "</tr>";
+                  echo "<td class='center'>";
+                  if (isset($data["states_id"])) {
+                     echo Dropdown::getDropdownName("glpi_states",$data['states_id']);
+                  } else {
+                     echo '&nbsp;';
+                  }                         
+                  echo "</td></tr>";
                }
             }
             $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 @@
 <?php
 /*
- * @version $Id: contract_item.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: contract_item.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: contract_supplier.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: contract_supplier.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: contracttype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: contracttype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 
 /*
- * @version $Id: crontask.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: crontask.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 
 /*
- * @version $Id: crontasklog.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: crontasklog.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: dbconnection.class.php 14834 2011-07-01 14:09:28Z remi $
+ * @version $Id: dbconnection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: db.function.php 15876 2011-10-18 09:53:53Z remi $
+ * @version $Id: db.function.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: dbmysql.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: dbmysql.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: devicecase.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicecase.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: devicecasetype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicecasetype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: devicecontrol.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicecontrol.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: devicedrive.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicedrive.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: devicegraphiccard.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicegraphiccard.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: deviceharddrive.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: deviceharddrive.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: devicememory.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicememory.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: devicememorytype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicememorytype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: devicemotherboard.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicemotherboard.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: devicenetworkcard.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicenetworkcard.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: devicepci.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicepci.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: devicepowersupply.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicepowersupply.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: deviceprocessor.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: deviceprocessor.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: devicesoundcard.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: devicesoundcard.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: display.function.php 15381 2011-08-12 07:02:47Z moyo $
+ * @version $Id: display.function.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -1758,7 +1757,8 @@
    //  Le fil d ariane
    echo "<div id='c_ssmenu2'>";
    echo "<ul>";
-   echo "<li><a href='#' title=''>".$LANG['central'][5]."></a></li>";
+   echo "<li><a href='".$CFG_GLPI["root_doc"]."/front/helpdesk.public.php' accesskey='0' title=\"".
+          $LANG['central'][5]."\">".$LANG['central'][5]."></a></li>";
    echo "<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</li>";
 
    if (haveRight('validate_ticket',1)) {
@@ -2318,7 +2318,8 @@
       echo "<tr class='tab_bg_1'>";
       echo "<td>".$LANG['help'][24]."&nbsp;:&nbsp;</td>";
       echo "<td>";
-      Ticket::dropdownMyDevices(getLoginUserID(), $_SESSION["glpiactive_entity"]);
+      Ticket::dropdownMyDevices(getLoginUserID(), $_SESSION["glpiactive_entity"], 
+                                $itemtype, $items_id);
       Ticket::dropdownAllDevices("itemtype", $itemtype, $items_id, 0,
                                  $_SESSION["glpiactive_entity"]);
       echo "</td></tr>";
diff -Nru glpi-0.80.5/inc/displaypreference.class.php glpi-0.80.7/inc/displaypreference.class.php
--- glpi-0.80.5/inc/displaypreference.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/displaypreference.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: displaypreference.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: displaypreference.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/documentcategory.class.php glpi-0.80.7/inc/documentcategory.class.php
--- glpi-0.80.5/inc/documentcategory.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/documentcategory.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: documentcategory.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: documentcategory.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/document.class.php glpi-0.80.7/inc/document.class.php
--- glpi-0.80.5/inc/document.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/document.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: document.class.php 15824 2011-10-03 08:20:40Z remi $
+ * @version $Id: document.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -1206,7 +1205,11 @@
          $linkparam = "&amp;tickets_id=".$item->fields['id'];
       }
 
-      $canedit = $item->can($ID,'w');
+      if ($item->getType() == 'Ticket' && $item->getField('status') == 'closed') {
+         $canedit = false;
+      } else {
+         $canedit = $item->can($ID,'w');
+      }
 
       $is_recursive=$item->isRecursive();
 
diff -Nru glpi-0.80.5/inc/document_item.class.php glpi-0.80.7/inc/document_item.class.php
--- glpi-0.80.5/inc/document_item.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/document_item.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: document_item.class.php 14842 2011-07-05 12:25:28Z remi $
+ * @version $Id: document_item.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/documenttype.class.php glpi-0.80.7/inc/documenttype.class.php
--- glpi-0.80.5/inc/documenttype.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/documenttype.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: documenttype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: documenttype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/domain.class.php glpi-0.80.7/inc/domain.class.php
--- glpi-0.80.5/inc/domain.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/domain.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: domain.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: domain.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/dropdown.class.php glpi-0.80.7/inc/dropdown.class.php
--- glpi-0.80.5/inc/dropdown.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/dropdown.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: dropdown.class.php 15573 2011-09-01 10:10:06Z moyo $
+ * @version $Id: dropdown.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -71,7 +70,7 @@
       $table = $item->getTable();
 
       $params['name']        = $item->getForeignKeyField();
-      $params['value']       = '';
+      $params['value']       = ($itemtype=='Entity' ? $_SESSION['glpiactive_entity'] : '');
       $params['comments']    = true;
       $params['entity']      = -1;
       $params['entity_sons'] = false;
@@ -1380,7 +1379,7 @@
 
                case 'Ticket' :
                   $tmp = new TicketFollowup();
-                  if ($tmp->canCreate()) {
+                  if ($tmp->canCreate() && $_SESSION['glpiactiveprofile']['interface'] == 'central') {
                      echo "<option value='add_followup'>".$LANG['job'][29]."</option>";
                   }
 
@@ -1424,7 +1423,7 @@
                 && ($item instanceof CommonDropdown)
                 && $item->maybeRecursive()) {
 
-               if ($isadmin) {
+               if ($isadmin && (count($_SESSION['glpiactiveentities'])>1)) {
                   echo "<option value='merge'>".$LANG['buttons'][48]." - ".$LANG['software'][48];
                   echo "</option>";
                }
diff -Nru glpi-0.80.5/inc/entity.class.php glpi-0.80.7/inc/entity.class.php
--- glpi-0.80.5/inc/entity.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/entity.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: entity.class.php 15051 2011-07-27 12:25:49Z remi $
+ * @version $Id: entity.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -158,6 +157,7 @@
                   $mailcollector = new RuleMailCollector();
                   $mailcollector->showAndAddRuleForm($this);
                }
+               EntityData::showAdvancedOptions($this);
                Document::showAssociated($this);
                EntityData::showNotificationOptions($this);
                EntityData::showHelpdeskOptions($this);
@@ -444,6 +444,12 @@
       $tab[20]['joinparams']    = array('jointype' => 'child');
       $tab[20]['datatype']      = 'string';
 
+      $tab[25]['table']         = 'glpi_entitydatas';
+      $tab[25]['field']         = 'postcode';
+      $tab[25]['name']          = $LANG['financial'][100];
+      $tab[25]['joinparams']    = array('jointype' => 'child');
+      $tab[25]['datatype']      = 'string';
+
       return $tab;
    }
 
diff -Nru glpi-0.80.5/inc/entitydata.class.php glpi-0.80.7/inc/entitydata.class.php
--- glpi-0.80.5/inc/entitydata.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/entitydata.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: entitydata.class.php 15605 2011-09-05 09:26:38Z remi $
+ * @version $Id: entitydata.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/event.class.php glpi-0.80.7/inc/event.class.php
--- glpi-0.80.5/inc/event.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/event.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: event.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: event.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/fieldblacklist.class.php glpi-0.80.7/inc/fieldblacklist.class.php
--- glpi-0.80.5/inc/fieldblacklist.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/fieldblacklist.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: fieldblacklist.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: fieldblacklist.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/fieldunicity.class.php glpi-0.80.7/inc/fieldunicity.class.php
--- glpi-0.80.5/inc/fieldunicity.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/fieldunicity.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: fieldunicity.class.php 14917 2011-07-13 09:10:10Z moyo $
+ * @version $Id: fieldunicity.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/filesystem.class.php glpi-0.80.7/inc/filesystem.class.php
--- glpi-0.80.5/inc/filesystem.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/filesystem.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: filesystem.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: filesystem.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/graphpalette.class.php glpi-0.80.7/inc/graphpalette.class.php
--- glpi-0.80.5/inc/graphpalette.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/graphpalette.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: graphpalette.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: graphpalette.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/group.class.php glpi-0.80.7/inc/group.class.php
--- glpi-0.80.5/inc/group.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/group.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: group.class.php 15536 2011-08-30 09:55:42Z yllen $
+ * @version $Id: group.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/group_ticket.class.php glpi-0.80.7/inc/group_ticket.class.php
--- glpi-0.80.5/inc/group_ticket.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/group_ticket.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: group_ticket.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: group_ticket.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/group_user.class.php glpi-0.80.7/inc/group_user.class.php
--- glpi-0.80.5/inc/group_user.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/group_user.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: group_user.class.php 14854 2011-07-06 12:09:21Z remi $
+ * @version $Id: group_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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/holiday.class.php glpi-0.80.7/inc/holiday.class.php
--- glpi-0.80.5/inc/holiday.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/holiday.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: holiday.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: holiday.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/includes.php glpi-0.80.7/inc/includes.php
--- glpi-0.80.5/inc/includes.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/includes.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: includes.php 15756 2011-09-23 21:51:02Z moyo $
+ * @version $Id: includes.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/index.php glpi-0.80.7/inc/index.php
--- glpi-0.80.5/inc/index.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/index.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: index.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: index.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/infocom.class.php glpi-0.80.7/inc/infocom.class.php
--- glpi-0.80.5/inc/infocom.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/infocom.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: infocom.class.php 15354 2011-08-10 13:53:50Z moyo $
+ * @version $Id: infocom.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/interfacetype.class.php glpi-0.80.7/inc/interfacetype.class.php
--- glpi-0.80.5/inc/interfacetype.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/interfacetype.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: interfacetype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: interfacetype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/knowbaseitemcategory.class.php glpi-0.80.7/inc/knowbaseitemcategory.class.php
--- glpi-0.80.5/inc/knowbaseitemcategory.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/knowbaseitemcategory.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: knowbaseitemcategory.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: knowbaseitemcategory.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/knowbaseitem.class.php glpi-0.80.7/inc/knowbaseitem.class.php
--- glpi-0.80.5/inc/knowbaseitem.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/knowbaseitem.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: knowbaseitem.class.php 15919 2011-10-25 07:47:28Z moyo $
+ * @version $Id: knowbaseitem.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/link.class.php glpi-0.80.7/inc/link.class.php
--- glpi-0.80.5/inc/link.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/link.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: link.class.php 15558 2011-08-30 14:51:30Z remi $
+ * @version $Id: link.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/link_itemtype.class.php glpi-0.80.7/inc/link_itemtype.class.php
--- glpi-0.80.5/inc/link_itemtype.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/link_itemtype.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: link_itemtype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: link_itemtype.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/location.class.php glpi-0.80.7/inc/location.class.php
--- glpi-0.80.5/inc/location.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/location.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: location.class.php 15047 2011-07-27 09:50:29Z remi $
+ * @version $Id: location.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/log.class.php glpi-0.80.7/inc/log.class.php
--- glpi-0.80.5/inc/log.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/log.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: log.class.php 14982 2011-07-21 09:41:15Z remi $
+ * @version $Id: log.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -172,7 +171,8 @@
 //                      }
 
                      // other cases ; link field -> get data from dropdown
-                     if ($val2["table"] != 'glpi_complete_entities') {
+                     if ($val2["table"] != 'glpi_complete_entities' 
+                        && $val2["table"] != 'glpi_auth_tables' ) {
                         $changes = array($id_search_option,
                                          addslashes(Dropdown::getDropdownName($val2["table"],
                                                                               $oldval)),
diff -Nru glpi-0.80.5/inc/mailcollector.class.php glpi-0.80.7/inc/mailcollector.class.php
--- glpi-0.80.5/inc/mailcollector.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/mailcollector.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: mailcollector.class.php 15420 2011-08-17 11:18:18Z moyo $
+ * @version $Id: mailcollector.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -523,7 +522,7 @@
       $glpi_message_match = "/GLPI-([0-9]+)\.[0-9]+\.[0-9]+@\w*/";
 
       // Check if email not send by GLPI : if yes -> blacklist
-      if (preg_match($glpi_message_match, $head['message_id'], $match)) {
+      if (!isset($head['message_id']) || preg_match($glpi_message_match, $head['message_id'], $match)) {
          $tkt['_blacklisted'] = true;
          return $tkt;
       }
@@ -781,7 +780,7 @@
     ///Connect To the Mail Box
    function connect() {
       $this->marubox = @imap_open($this->fields['host'], $this->fields['login'],
-                                  decrypt($this->fields['passwd'],GLPIKEY), 1);
+                                  decrypt($this->fields['passwd'],GLPIKEY), CL_EXPUNGE);
    }
 
 
diff -Nru glpi-0.80.5/inc/manufacturer.class.php glpi-0.80.7/inc/manufacturer.class.php
--- glpi-0.80.5/inc/manufacturer.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/manufacturer.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: manufacturer.class.php 15040 2011-07-27 08:41:31Z remi $
+ * @version $Id: manufacturer.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/migration.class.php glpi-0.80.7/inc/migration.class.php
--- glpi-0.80.5/inc/migration.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/migration.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: migration.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: migration.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/monitor.class.php glpi-0.80.7/inc/monitor.class.php
--- glpi-0.80.5/inc/monitor.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/monitor.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: monitor.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: monitor.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/monitormodel.class.php glpi-0.80.7/inc/monitormodel.class.php
--- glpi-0.80.5/inc/monitormodel.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/monitormodel.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: monitormodel.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: monitormodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/monitortype.class.php glpi-0.80.7/inc/monitortype.class.php
--- glpi-0.80.5/inc/monitortype.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/monitortype.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: monitortype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: monitortype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/netpoint.class.php glpi-0.80.7/inc/netpoint.class.php
--- glpi-0.80.5/inc/netpoint.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/netpoint.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: netpoint.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: netpoint.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/network.class.php glpi-0.80.7/inc/network.class.php
--- glpi-0.80.5/inc/network.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/network.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: network.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: network.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/networkequipment.class.php glpi-0.80.7/inc/networkequipment.class.php
--- glpi-0.80.5/inc/networkequipment.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/networkequipment.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkequipment.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkequipment.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/networkequipmentfirmware.class.php glpi-0.80.7/inc/networkequipmentfirmware.class.php
--- glpi-0.80.5/inc/networkequipmentfirmware.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/networkequipmentfirmware.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkequipmentfirmware.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkequipmentfirmware.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/networkequipmentmodel.class.php glpi-0.80.7/inc/networkequipmentmodel.class.php
--- glpi-0.80.5/inc/networkequipmentmodel.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/networkequipmentmodel.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkequipmentmodel.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkequipmentmodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/networkequipmenttype.class.php glpi-0.80.7/inc/networkequipmenttype.class.php
--- glpi-0.80.5/inc/networkequipmenttype.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/networkequipmenttype.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkequipmenttype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkequipmenttype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/networkinterface.class.php glpi-0.80.7/inc/networkinterface.class.php
--- glpi-0.80.5/inc/networkinterface.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/networkinterface.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkinterface.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkinterface.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/networkport.class.php glpi-0.80.7/inc/networkport.class.php
--- glpi-0.80.5/inc/networkport.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/networkport.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkport.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkport.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/networkport_networkport.class.php glpi-0.80.7/inc/networkport_networkport.class.php
--- glpi-0.80.5/inc/networkport_networkport.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/networkport_networkport.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkport_networkport.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkport_networkport.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/networkport_vlan.class.php glpi-0.80.7/inc/networkport_vlan.class.php
--- glpi-0.80.5/inc/networkport_vlan.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/networkport_vlan.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: networkport_vlan.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: networkport_vlan.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/notification.class.php glpi-0.80.7/inc/notification.class.php
--- glpi-0.80.5/inc/notification.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/notification.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notification.class.php 15240 2011-08-06 11:40:59Z remi $
+ * @version $Id: notification.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/notificationevent.class.php glpi-0.80.7/inc/notificationevent.class.php
--- glpi-0.80.5/inc/notificationevent.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/notificationevent.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationevent.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notificationevent.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/notificationinterface.class.php glpi-0.80.7/inc/notificationinterface.class.php
--- glpi-0.80.5/inc/notificationinterface.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/notificationinterface.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationinterface.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notificationinterface.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/notificationmail.class.php glpi-0.80.7/inc/notificationmail.class.php
--- glpi-0.80.5/inc/notificationmail.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/notificationmail.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationmail.class.php 15073 2011-07-28 09:43:27Z moyo $
+ * @version $Id: notificationmail.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/notificationmailsetting.class.php glpi-0.80.7/inc/notificationmailsetting.class.php
--- glpi-0.80.5/inc/notificationmailsetting.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/notificationmailsetting.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationmailsetting.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notificationmailsetting.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/notificationtargetcartridge.class.php glpi-0.80.7/inc/notificationtargetcartridge.class.php
--- glpi-0.80.5/inc/notificationtargetcartridge.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/notificationtargetcartridge.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationtargetcartridge.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notificationtargetcartridge.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/notificationtarget.class.php glpi-0.80.7/inc/notificationtarget.class.php
--- glpi-0.80.5/inc/notificationtarget.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/notificationtarget.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationtarget.class.php 15195 2011-08-03 08:49:18Z remi $
+ * @version $Id: notificationtarget.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/notificationtargetconsumable.class.php glpi-0.80.7/inc/notificationtargetconsumable.class.php
--- glpi-0.80.5/inc/notificationtargetconsumable.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/notificationtargetconsumable.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationtargetconsumable.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notificationtargetconsumable.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/notificationtargetcontract.class.php glpi-0.80.7/inc/notificationtargetcontract.class.php
--- glpi-0.80.5/inc/notificationtargetcontract.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/notificationtargetcontract.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationtargetcontract.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notificationtargetcontract.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/notificationtargetcrontask.class.php glpi-0.80.7/inc/notificationtargetcrontask.class.php
--- glpi-0.80.5/inc/notificationtargetcrontask.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/notificationtargetcrontask.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationtargetcrontask.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notificationtargetcrontask.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/notificationtargetdbconnection.class.php glpi-0.80.7/inc/notificationtargetdbconnection.class.php
--- glpi-0.80.5/inc/notificationtargetdbconnection.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/notificationtargetdbconnection.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationtargetdbconnection.class.php 14834 2011-07-01 14:09:28Z remi $
+ * @version $Id: notificationtargetdbconnection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/notificationtargetfieldunicity.class.php glpi-0.80.7/inc/notificationtargetfieldunicity.class.php
--- glpi-0.80.5/inc/notificationtargetfieldunicity.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/notificationtargetfieldunicity.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationtargetfieldunicity.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notificationtargetfieldunicity.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/notificationtargetinfocom.class.php glpi-0.80.7/inc/notificationtargetinfocom.class.php
--- glpi-0.80.5/inc/notificationtargetinfocom.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/notificationtargetinfocom.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationtargetinfocom.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notificationtargetinfocom.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/notificationtargetreservation.class.php glpi-0.80.7/inc/notificationtargetreservation.class.php
--- glpi-0.80.5/inc/notificationtargetreservation.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/notificationtargetreservation.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationtargetreservation.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notificationtargetreservation.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/notificationtargetsoftwarelicense.class.php glpi-0.80.7/inc/notificationtargetsoftwarelicense.class.php
--- glpi-0.80.5/inc/notificationtargetsoftwarelicense.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/notificationtargetsoftwarelicense.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationtargetsoftwarelicense.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notificationtargetsoftwarelicense.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/notificationtargetticket.class.php glpi-0.80.7/inc/notificationtargetticket.class.php
--- glpi-0.80.5/inc/notificationtargetticket.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/notificationtargetticket.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationtargetticket.class.php 14908 2011-07-12 14:39:24Z moyo $
+ * @version $Id: notificationtargetticket.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ along with GLPI. If not, see <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -46,21 +45,23 @@
       $this->options['sendprivate']=false;
 
       if (isset($options['followup_id'])) {
-         $fup = new TicketFollowup();
+         $this->options['sendprivate'] = $options['is_private'];
+/*         $fup = new TicketFollowup();
          if ($fup->getFromDB($options['followup_id'])) {
             if ($fup->fields['is_private']) {
                $this->options['sendprivate'] = true;
             }
-         }
+         }*/
       }
 
       if (isset($options['task_id'])) {
-         $fup = new TicketTask();
+         $this->options['sendprivate'] = $options['is_private'];
+/*         $fup = new TicketTask();
          if ($fup->getFromDB($options['task_id'])) {
             if ($fup->fields['is_private']) {
                $this->options['sendprivate'] = true;
             }
-         }
+         }*/
       }
    }
 
@@ -832,7 +833,7 @@
 
          if ($this->obj->countGroups(Ticket::REQUESTER)) {
             $groups = array();
-            foreach ($this->obj->getUsers(Ticket::REQUESTER) as $gid => $tmp) {
+            foreach ($this->obj->getGroups(Ticket::REQUESTER) as $gid => $tmp) {
                $groups[$gid] = Dropdown::getDropdownName('glpi_groups', $gid);
             }
             $this->datas['##ticket.groups##'] = implode(', ',$groups);
@@ -1143,6 +1144,9 @@
                $tmp['##ticket.time##']             = Ticket::getActionTime($ticket['actiontime']);
                $tmp['##ticket.costtime##']         = $ticket['cost_time'];
                $tmp['##ticket.creationdate##']     = convDateTime($ticket['date']);
+               $tmp['##ticket.closedate##']        = convDateTime($ticket['closedate']);
+               $tmp['##ticket.solvedate##']        = convDateTime($ticket['solvedate']);
+               $tmp['##ticket.duedate##']          = convDateTime($ticket['due_date']);
                $tmp['##ticket.content##']          = $ticket['content'];
 
 
@@ -1224,7 +1228,7 @@
 
                if ($t->countUsers(Ticket::OBSERVER)) {
                   $users = array();
-                  foreach ($t->getUsers(Ticket::OBSERVER) as $uid => $tmp) {
+                  foreach ($t->getUsers(Ticket::OBSERVER) as $uid => $val) {
                      $user_tmp = new User();
                      $user_tmp->getFromDB($uid);
                      $users[$uid] = $user_tmp->getName();
@@ -1236,7 +1240,7 @@
 
                if ($t->countGroups(Ticket::OBSERVER)) {
                   $groups = array();
-                  foreach ($t->getGroups(Ticket::OBSERVER) as $gid => $tmp) {
+                  foreach ($t->getGroups(Ticket::OBSERVER) as $gid => $val) {
                      $groups[$gid] = Dropdown::getDropdownName('glpi_groups', $gid);
                   }
                   $tmp['##ticket.observergroups##'] = implode(', ',$groups);
diff -Nru glpi-0.80.5/inc/notificationtargetuser.class.php glpi-0.80.7/inc/notificationtargetuser.class.php
--- glpi-0.80.5/inc/notificationtargetuser.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/notificationtargetuser.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationtargetuser.class.php 15231 2011-08-05 12:49:04Z remi $
+ * @version $Id: notificationtargetuser.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/notificationtemplate.class.php glpi-0.80.7/inc/notificationtemplate.class.php
--- glpi-0.80.5/inc/notificationtemplate.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/notificationtemplate.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationtemplate.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notificationtemplate.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/notificationtemplatetranslation.class.php glpi-0.80.7/inc/notificationtemplatetranslation.class.php
--- glpi-0.80.5/inc/notificationtemplatetranslation.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/notificationtemplatetranslation.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: notificationtemplatetranslation.class.php 15195 2011-08-03 08:49:18Z remi $
+ * @version $Id: notificationtemplatetranslation.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/notimportedemail.class.php glpi-0.80.7/inc/notimportedemail.class.php
--- glpi-0.80.5/inc/notimportedemail.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/notimportedemail.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: notimportedemail.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: notimportedemail.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/ocsadmininfoslink.class.php glpi-0.80.7/inc/ocsadmininfoslink.class.php
--- glpi-0.80.5/inc/ocsadmininfoslink.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ocsadmininfoslink.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ocsadmininfoslink.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ocsadmininfoslink.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/ocslink.class.php glpi-0.80.7/inc/ocslink.class.php
--- glpi-0.80.5/inc/ocslink.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ocslink.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ocslink.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ocslink.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/ocsserver.class.php glpi-0.80.7/inc/ocsserver.class.php
--- glpi-0.80.5/inc/ocsserver.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/ocsserver.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ocsserver.class.php 15862 2011-10-17 11:34:12Z remi $
+ * @version $Id: ocsserver.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -834,12 +833,13 @@
          foreach ($ocsServers as $ocsServer) {
                $msg .= $LANG['ocsconfig'][2]." : '".$ocsServer['ocs_db_host']."'";
                $msg .= ', '.(self::checkOCSconnection($ocsServer['id'])?$LANG['ocsng'][18]
-                                                                       :$LANG['ocsng'][18]);
+                                                                       :$LANG['ocsng'][21]);
                $msg .= ', '.$LANG['ocsconfig'][38]. " : ".$ocsServer['use_soft_dict'];
          }
+
+         echo wordwrap($msg."\n", $width, "\n\t\t");
+         echo "\n</pre></td></tr>";
       }
-      echo wordwrap($msg."\n", $width, "\n\t\t");
-      echo "\n</pre></td></tr>";
    }
 
 
@@ -2233,7 +2233,7 @@
          }
       }
 
-      $query = "SELECT *
+      $query = "SELECT `ocsid`
                 FROM `glpi_ocslinks`
                 WHERE `ocsservers_id` = '$ocsservers_id'";
       $result = $DB->query($query);
@@ -2771,7 +2771,7 @@
                }
                echo "</a></td></tr>";
 
-               echo "<tr class='tab_bg_1'><td class='center b'>".$LANG['ocsconfig'][18] . "<br>";
+               echo "<tr class='tab_bg_1'><td class='center b'>".$LANG['ocsconfig'][18] . "</td>";
                echo "</tr></table></form></div>";
             }
 
@@ -2831,8 +2831,8 @@
                   }
                   echo "<td>";
                   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 "</td>\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 "</td>\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 "<form action='$target' method='get'>";
          echo "<div class='center'><table class='tab_cadre'>";
          echo "<tr class='tab_bg_2'><th colspan='2'>" . $LANG['ocsng'][26] . "</th></tr>\n";
 
          echo "<tr class='tab_bg_2'><td class='center' colspan=2>".$LANG['ocsng'][27]."</td></tr>";
-         echo "</table></div></form>\n";
+         echo "</table></div>\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 @@
 <?php
 /*
- * @version $Id: operatingsystem.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: operatingsystem.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: operatingsystemservicepack.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: operatingsystemservicepack.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: operatingsystemversion.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: operatingsystemversion.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: peripheral.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: peripheral.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: peripheralmodel.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: peripheralmodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: peripheraltype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: peripheraltype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: phone.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: phone.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -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 @@
 <?php
 /*
- * @version $Id: phonemodel.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: phonemodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: phonepowersupply.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: phonepowersupply.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: phonetype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: phonetype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: planning.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: planning.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: plugin.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: plugin.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: plugin.function.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: plugin.function.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -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 @@
 <?php
 /*
- * @version $Id: preference.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: preference.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: printer.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: printer.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: printermodel.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: printermodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: printertype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: printertype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: profile.class.php 15052 2011-07-27 12:27:57Z remi $
+ * @version $Id: profile.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: profile_user.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: profile_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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -113,7 +112,8 @@
 
          echo "<tr class='tab_bg_2'><td class='center'>";
          echo "<input type='hidden' name='users_id' value='$ID'>";
-         Dropdown::show('Entity', array('entity' => $_SESSION['glpiactiveentities']));
+         Dropdown::show('Entity', array('entity' => $_SESSION['glpiactiveentities'],
+                                        'value'  => $_SESSION['glpiactive_entity']));
          echo "</td><td class='center'>".$LANG['profiles'][22]."&nbsp;: ";
          Profile::dropdownUnder(array('value' => Profile::getDefault()));
          echo "</td><td class='center'>".$LANG['profiles'][28]."&nbsp;: ";
@@ -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 @@
 <?php
 /*
- * @version $Id: registrykey.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: registrykey.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: relation.constant.php 15756 2011-09-23 21:51:02Z moyo $
+ * @version $Id: relation.constant.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: reminder.class.php 14892 2011-07-08 11:34:03Z moyo $
+ * @version $Id: reminder.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: requesttype.class.php 15051 2011-07-27 12:25:49Z remi $
+ * @version $Id: requesttype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: reservation.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: reservation.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: reservationitem.class.php 14892 2011-07-08 11:34:03Z moyo $
+ * @version $Id: reservationitem.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruleaction.class.php 15195 2011-08-03 08:49:18Z remi $
+ * @version $Id: ruleaction.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: rulecached.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rulecached.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: rulecachedcollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rulecachedcollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: rule.class.php 15921 2011-10-25 08:00:25Z moyo $
+ * @version $Id: rule.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -1042,18 +1041,21 @@
          echo "<td>&nbsp;</td>";
       }
 
-      echo "<td><a id='rules".$this->fields["id"]."' href=\"".str_replace(".php",".form.php",$target).
-                 "?id=".$this->fields["id"]."&amp;onglet=1\">" . $this->fields["name"] . "</a> ";
+      echo "<td>".$this->getLink()."&nbsp;";
 
       if (!empty($this->fields["comment"])) {
-         showToolTip($this->fields["comment"], array('applyto' => "rules".$this->fields["id"]));
+         showToolTip($this->fields["comment"]);
       }
       echo "</td>";
       echo "<td>".$this->fields["description"]."</td>";
       echo "<td>".Dropdown::getYesNo($this->fields["is_active"])."</td>";
 
       if ($display_entities) {
-         echo "<td>".Dropdown::getDropdownName('glpi_entities', $this->fields['entities_id'])."</td>";
+         $rec = '';
+         if ($this->maybeRecursive() && $this->fields['is_recursive']) {
+            $rec =' <b>(R)</b>';
+         }
+         echo "<td>".Dropdown::getDropdownName('glpi_entities', $this->fields['entities_id'])."$rec</td>";
       }
 
       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 @@
 <?php
 /*
- * @version $Id: rulecollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rulecollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: rulecriteria.class.php 15699 2011-09-15 15:34:45Z moyo $
+ * @version $Id: rulecriteria.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarycomputermodel.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarycomputermodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarycomputermodelcollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarycomputermodelcollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarycomputertype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarycomputertype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarycomputertypecollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarycomputertypecollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarydropdown.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarydropdown.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarydropdowncollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarydropdowncollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarymanufacturer.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarymanufacturer.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarymanufacturercollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarymanufacturercollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarymonitormodel.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarymonitormodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarymonitormodelcollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarymonitormodelcollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarymonitortype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarymonitortype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarymonitortypecollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarymonitortypecollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarynetworkequipmentmodel.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarynetworkequipmentmodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarynetworkequipmentmodelcollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarynetworkequipmentmodelcollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarynetworkequipmenttype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarynetworkequipmenttype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnarynetworkequipmenttypecollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnarynetworkequipmenttypecollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryoperatingsystem.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryoperatingsystem.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryoperatingsystemcollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryoperatingsystemcollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryoperatingsystemservicepack.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryoperatingsystemservicepack.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryoperatingsystemservicepackcollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryoperatingsystemservicepackcollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryoperatingsystemversion.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryoperatingsystemversion.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryoperatingsystemversioncollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryoperatingsystemversioncollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryperipheralmodel.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryperipheralmodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryperipheralmodelcollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryperipheralmodelcollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryperipheraltype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryperipheraltype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryperipheraltypecollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryperipheraltypecollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryphonemodel.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryphonemodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryphonemodelcollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryphonemodelcollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryphonetype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryphonetype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryphonetypecollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryphonetypecollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryprintermodel.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryprintermodel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryprintermodelcollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryprintermodelcollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryprintertype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryprintertype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruledictionnaryprintertypecollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruledictionnaryprintertypecollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruleimportcomputer.class.php 15652 2011-09-12 06:39:51Z remi $
+ * @version $Id: ruleimportcomputer.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruleimportcomputercollection.class.php 15599 2011-09-03 07:17:36Z remi $
+ * @version $Id: ruleimportcomputercollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: rulemailcollector.class.php 14943 2011-07-18 13:07:56Z moyo $
+ * @version $Id: rulemailcollector.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -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 @@
 <?php
 /*
- * @version $Id: rulemailcollectorcollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rulemailcollectorcollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruleocs.class.php 14858 2011-07-07 06:59:37Z remi $
+ * @version $Id: ruleocs.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruleocscollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruleocscollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruleright.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruleright.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: rulerightcollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rulerightcollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 
 /*
- * @version $Id: rulerightparameter.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rulerightparameter.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: rulesoftwarecategory.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rulesoftwarecategory.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: rulesoftwarecategorycollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: rulesoftwarecategorycollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruleticket.class.php 14926 2011-07-13 14:03:56Z moyo $
+ * @version $Id: ruleticket.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ruleticketcollection.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ruleticketcollection.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: search.class.php 15806 2011-09-28 12:25:16Z moyo $
+ * @version $Id: search.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -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 @@
 <?php
 
 /*
- * @version $Id: setup.function.php 15497 2011-08-24 13:14:25Z walid $
+ * @version $Id: setup.function.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: singletonrulelist.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: singletonrulelist.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: sla.class.php 15830 2011-10-04 09:30:14Z yllen $
+ * @version $Id: sla.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: slalevelaction.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: slalevelaction.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: slalevel.class.php 15921 2011-10-25 08:00:25Z moyo $
+ * @version $Id: slalevel.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: slalevel_ticket.class.php 15889 2011-10-18 15:20:20Z moyo $
+ * @version $Id: slalevel_ticket.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: softwarecategory.class.php 15040 2011-07-27 08:41:31Z remi $
+ * @version $Id: softwarecategory.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: softwarelicensetype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: softwarelicensetype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: stat.class.php 15307 2011-08-09 16:22:46Z moyo $
+ * @version $Id: stat.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: state.class.php 15051 2011-07-27 12:25:49Z remi $
+ * @version $Id: state.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: supplier.class.php 15040 2011-07-27 08:41:31Z remi $
+ * @version $Id: supplier.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: suppliertype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: suppliertype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: taskcategory.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: taskcategory.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ticketcategory.class.php 15051 2011-07-27 12:25:49Z remi $
+ * @version $Id: ticketcategory.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -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 @@
 <?php
 /*
- * @version $Id: ticket.class.php 15921 2011-10-25 08:00:25Z moyo $
+ * @version $Id: ticket.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -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 "<td><span class='tracking_small'>".$LANG['joblist'][11]."&nbsp;: </span></td>";
       echo "<td>";
       $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 @@
 <?php
 /*
- * @version $Id: ticketfollowup.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ticketfollowup.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -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 @@
 <?php
 /*
- * @version $Id: ticketplanning.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ticketplanning.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ticketsatisfaction.class.php 14982 2011-07-21 09:41:15Z remi $
+ * @version $Id: ticketsatisfaction.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ticketsolutiontemplate.class.php 15662 2011-09-13 06:40:13Z moyo $
+ * @version $Id: ticketsolutiontemplate.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ticketsolutiontype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ticketsolutiontype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: tickettask.class.php 15707 2011-09-20 06:56:37Z moyo $
+ * @version $Id: tickettask.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -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 @@
 <?php
 /*
- * @version $Id: ticket_ticket.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: ticket_ticket.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: ticket_user.class.php 14979 2011-07-20 15:54:36Z moyo $
+ * @version $Id: ticket_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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 
 /*
- * @version $Id: ticketvalidation.class.php 15923 2011-10-25 08:06:24Z moyo $
+ * @version $Id: ticketvalidation.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: timer.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: timer.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: transfer.class.php 15526 2011-08-30 07:31:49Z moyo $
+ * @version $Id: transfer.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 @@
 <?php
 /*
- * @version $Id: usercategory.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: usercategory.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -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 "<th>".$LANG['common'][16]."</th>";
       echo "<th>".$LANG['common'][19]."</th>";
       echo "<th>".$LANG['common'][20]."</th>";
+      echo "<th>".$LANG['state'][0]."</th>";      
       echo "<th>&nbsp;</th></tr>";
 
       foreach ($CFG_GLPI["linkuser_types"] as $itemtype) {
@@ -2305,7 +2310,13 @@
                   } else {
                      echo '&nbsp;';
                   }
-                  echo "<td class='center'>$linktype</td></tr>";
+                  echo "</td><td class='center'>";
+                  if (isset($data["states_id"])) {
+                     echo Dropdown::getDropdownName("glpi_states",$data['states_id']);
+                  } else {
+                     echo '&nbsp;';
+                  }                  
+                  echo "</td><td class='center'>$linktype</td></tr>";
                }
             }
          }
diff -Nru glpi-0.80.5/inc/usertitle.class.php glpi-0.80.7/inc/usertitle.class.php
--- glpi-0.80.5/inc/usertitle.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/usertitle.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: usertitle.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: usertitle.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/virtualmachinestate.class.php glpi-0.80.7/inc/virtualmachinestate.class.php
--- glpi-0.80.5/inc/virtualmachinestate.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/virtualmachinestate.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: virtualmachinestate.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: virtualmachinestate.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/virtualmachinesystem.class.php glpi-0.80.7/inc/virtualmachinesystem.class.php
--- glpi-0.80.5/inc/virtualmachinesystem.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/virtualmachinesystem.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: virtualmachinesystem.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: virtualmachinesystem.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/virtualmachinetype.class.php glpi-0.80.7/inc/virtualmachinetype.class.php
--- glpi-0.80.5/inc/virtualmachinetype.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/virtualmachinetype.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: virtualmachinetype.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: virtualmachinetype.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/vlan.class.php glpi-0.80.7/inc/vlan.class.php
--- glpi-0.80.5/inc/vlan.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/vlan.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: vlan.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: vlan.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/inc/xml.class.php glpi-0.80.7/inc/xml.class.php
--- glpi-0.80.5/inc/xml.class.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/inc/xml.class.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: xml.class.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: xml.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/index.php glpi-0.80.7/index.php
--- glpi-0.80.5/index.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/index.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: index.php 15238 2011-08-06 11:28:26Z remi $
+ * @version $Id: index.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/index.php glpi-0.80.7/install/index.php
--- glpi-0.80.5/install/index.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/index.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: index.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: index.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/install.php glpi-0.80.7/install/install.php
--- glpi-0.80.5/install/install.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/install.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: install.php 15519 2011-08-30 06:32:24Z moyo $
+ * @version $Id: install.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/mysql/glpi-0.80.3-empty.sql glpi-0.80.7/install/mysql/glpi-0.80.3-empty.sql
--- glpi-0.80.5/install/mysql/glpi-0.80.3-empty.sql	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/mysql/glpi-0.80.3-empty.sql	2012-02-09 20:24:11.000000000 +0000
@@ -758,7 +758,7 @@
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
-INSERT INTO `glpi_configs` VALUES ('1','0','250','15','50','30',' 0.80.5','5','0','admsys@xxxxx.fr',NULL,NULL,NULL,'SIGNATURE','0','fr_FR','#fff2f2','#ffe0e0','#ffcece','#ffbfbf','#ffadad','#ff5555','2005-12-31','10','','443','',NULL,'1',NULL,'0','08:00:00','20:00:00','1','0','0','http://localhost/glpi/','0','','','100','*','0','50','1','1','0','0',';','0','50','0','0',NULL,'25',NULL,NULL,'8080',NULL,'1','0','0','0','0','0','0','5','2',NULL,NULL,'0','2','2','2','2','1','0','1','1','1','1','0','0','0','0','0','0','0','1','1','1','1',NULL,'0','1','0','2097152','0','0','1','0','svg','1','1','1','{\"1\":{\"1\":1,\"2\":1,\"3\":2,\"4\":2,\"5\":2},\"2\":{\"1\":1,\"2\":2,\"3\":2,\"4\":3,\"5\":3},\"3\":{\"1\":2,\"2\":2,\"3\":3,\"4\":4,\"5\":4},\"4\":{\"1\":2,\"2\":3,\"3\":4,\"4\":4,\"5\":5},\"5\":{\"1\":2,\"2\":3,\"3\":4,\"4\":5,\"5\":5}}','62','62','0','0','0','-1','0','0','0','0',NULL,NULL,'0');
+INSERT INTO `glpi_configs` VALUES ('1','0','250','15','50','30',' 0.80.7','5','0','admsys@xxxxx.fr',NULL,NULL,NULL,'SIGNATURE','0','fr_FR','#fff2f2','#ffe0e0','#ffcece','#ffbfbf','#ffadad','#ff5555','2005-12-31','10','','443','',NULL,'1',NULL,'0','08:00:00','20:00:00','1','0','0','http://localhost/glpi/','0','','','100','*','0','50','1','1','0','0',';','0','50','0','0',NULL,'25',NULL,NULL,'8080',NULL,'1','0','0','0','0','0','0','5','2',NULL,NULL,'0','2','2','2','2','1','0','1','1','1','1','0','0','0','0','0','0','0','1','1','1','1',NULL,'0','1','0','2097152','0','0','1','0','svg','1','1','1','{\"1\":{\"1\":1,\"2\":1,\"3\":2,\"4\":2,\"5\":2},\"2\":{\"1\":1,\"2\":2,\"3\":2,\"4\":3,\"5\":3},\"3\":{\"1\":2,\"2\":2,\"3\":3,\"4\":4,\"5\":4},\"4\":{\"1\":2,\"2\":3,\"3\":4,\"4\":4,\"5\":5},\"5\":{\"1\":2,\"2\":3,\"3\":4,\"4\":5,\"5\":5}}','62','62','0','0','0','-1','0','0','0','0',NULL,NULL,'0');
 
 ### Dump table glpi_consumableitems
 
@@ -971,16 +971,6 @@
   KEY `crontasklogs_id_state` (`crontasklogs_id`,`state`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
-INSERT INTO `glpi_crontasklogs` VALUES ('1','6','0','2011-01-18 11:40:43','0','0','0','Mode d\'exécution : GLPI');
-INSERT INTO `glpi_crontasklogs` VALUES ('2','6','1','2011-01-18 11:40:43','2','0.00222397','0','Action terminée, rien à faire');
-INSERT INTO `glpi_crontasklogs` VALUES ('3','8','0','2011-03-04 11:35:21','0','0','0','Mode d\'exécution : GLPI');
-INSERT INTO `glpi_crontasklogs` VALUES ('4','8','3','2011-03-04 11:35:21','2','0.0720789','184','Action terminée, traitement complet');
-INSERT INTO `glpi_crontasklogs` VALUES ('5','9','0','2011-06-28 11:34:37','0','0','0','Mode d\'exécution : GLPI');
-INSERT INTO `glpi_crontasklogs` VALUES ('6','9','5','2011-06-28 11:34:37','2','0.0198219','0','Action terminée, rien à faire');
-INSERT INTO `glpi_crontasklogs` VALUES ('7','12','0','2011-08-30 08:22:27','0','0','0','Mode d\'exécution : GLPI');
-INSERT INTO `glpi_crontasklogs` VALUES ('8','12','7','2011-08-30 08:22:27','1','0.101052','1','Clean 1 session file(s) created since more than 180 seconds
-');
-INSERT INTO `glpi_crontasklogs` VALUES ('9','12','7','2011-08-30 08:22:27','2','0.102898','1','Action terminée, traitement complet');
 
 ### Dump table glpi_crontasks
 
@@ -1670,11 +1660,6 @@
   KEY `item` (`type`,`items_id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
-INSERT INTO `glpi_events` VALUES ('1','-1','system','2011-01-18 11:40:45','login','3','glpi connexion de l\'IP: 127.0.0.1');
-INSERT INTO `glpi_events` VALUES ('2','-1','system','2011-03-04 11:35:25','login','3','glpi connexion de l\'IP: 127.0.0.1');
-INSERT INTO `glpi_events` VALUES ('3','-1','system','2011-06-28 11:34:39','login','3','glpi connexion de l\'IP: 127.0.0.1');
-INSERT INTO `glpi_events` VALUES ('4','-1','system','2011-08-30 08:22:29','login','3','glpi connexion de l\'IP: 127.0.0.1');
-
 ### Dump table glpi_fieldblacklists
 
 DROP TABLE IF EXISTS `glpi_fieldblacklists`;
@@ -3332,7 +3317,7 @@
 
 INSERT INTO `glpi_profiles_users` VALUES ('2','2','4','0','1','0');
 INSERT INTO `glpi_profiles_users` VALUES ('3','3','1','0','1','0');
-INSERT INTO `glpi_profiles_users` VALUES ('4','4','4','0','1','0');
+INSERT INTO `glpi_profiles_users` VALUES ('4','4','3','0','1','0');
 INSERT INTO `glpi_profiles_users` VALUES ('5','5','2','0','1','0');
 
 ### Dump table glpi_registrykeys
diff -Nru glpi-0.80.5/install/update_031_04.php glpi-0.80.7/install/update_031_04.php
--- glpi-0.80.5/install/update_031_04.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_031_04.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: update_031_04.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: update_031_04.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_04_042.php glpi-0.80.7/install/update_04_042.php
--- glpi-0.80.5/install/update_04_042.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_04_042.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: update_04_042.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: update_04_042.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_042_05.php glpi-0.80.7/install/update_042_05.php
--- glpi-0.80.5/install/update_042_05.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_042_05.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: update_042_05.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: update_042_05.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_05_051.php glpi-0.80.7/install/update_05_051.php
--- glpi-0.80.5/install/update_05_051.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_05_051.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: update_05_051.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: update_05_051.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_051_06.php glpi-0.80.7/install/update_051_06.php
--- glpi-0.80.5/install/update_051_06.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_051_06.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: update_051_06.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: update_051_06.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_06_065.php glpi-0.80.7/install/update_06_065.php
--- glpi-0.80.5/install/update_06_065.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_06_065.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: update_06_065.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: update_06_065.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_065_068.php glpi-0.80.7/install/update_065_068.php
--- glpi-0.80.5/install/update_065_068.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_065_068.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: update_065_068.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: update_065_068.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_068_0681.php glpi-0.80.7/install/update_068_0681.php
--- glpi-0.80.5/install/update_068_0681.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_068_0681.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: update_068_0681.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: update_068_0681.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_0681_07.php glpi-0.80.7/install/update_0681_07.php
--- glpi-0.80.5/install/update_0681_07.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_0681_07.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: update_0681_07.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: update_0681_07.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_07_071.php glpi-0.80.7/install/update_07_071.php
--- glpi-0.80.5/install/update_07_071.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_07_071.php	2012-02-09 20:24:11.000000000 +0000
@@ -2,10 +2,10 @@
 
 
 /*
- * @version $Id: update_07_071.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: update_07_071.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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_071_0712.php glpi-0.80.7/install/update_071_0712.php
--- glpi-0.80.5/install/update_071_0712.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_071_0712.php	2012-02-09 20:24:11.000000000 +0000
@@ -2,10 +2,10 @@
 
 
 /*
- * @version $Id: update_071_0712.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: update_071_0712.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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_0712_0713.php glpi-0.80.7/install/update_0712_0713.php
--- glpi-0.80.5/install/update_0712_0713.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_0712_0713.php	2012-02-09 20:24:11.000000000 +0000
@@ -2,10 +2,10 @@
 
 
 /*
- * @version $Id: update_0712_0713.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: update_0712_0713.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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_0713_072.php glpi-0.80.7/install/update_0713_072.php
--- glpi-0.80.5/install/update_0713_072.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_0713_072.php	2012-02-09 20:24:11.000000000 +0000
@@ -2,10 +2,10 @@
 
 
 /*
- * @version $Id: update_0713_072.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: update_0713_072.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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_072_0721.php glpi-0.80.7/install/update_072_0721.php
--- glpi-0.80.5/install/update_072_0721.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_072_0721.php	2012-02-09 20:24:11.000000000 +0000
@@ -2,10 +2,10 @@
 
 
 /*
- * @version $Id: update_072_0721.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: update_072_0721.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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_0721_0722.php glpi-0.80.7/install/update_0721_0722.php
--- glpi-0.80.5/install/update_0721_0722.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_0721_0722.php	2012-02-09 20:24:11.000000000 +0000
@@ -2,10 +2,10 @@
 
 
 /*
- * @version $Id: update_0721_0722.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: update_0721_0722.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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_0722_0723.php glpi-0.80.7/install/update_0722_0723.php
--- glpi-0.80.5/install/update_0722_0723.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_0722_0723.php	2012-02-09 20:24:11.000000000 +0000
@@ -2,10 +2,10 @@
 
 
 /*
- * @version $Id: update_0722_0723.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: update_0722_0723.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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_0723_078.php glpi-0.80.7/install/update_0723_078.php
--- glpi-0.80.5/install/update_0723_078.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_0723_078.php	2012-02-09 20:24:11.000000000 +0000
@@ -2,10 +2,10 @@
 
 
 /*
- * @version $Id: update_0723_078.php 15858 2011-10-17 06:52:09Z yllen $
+ * @version $Id: update_0723_078.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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_078_0781.php glpi-0.80.7/install/update_078_0781.php
--- glpi-0.80.5/install/update_078_0781.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_078_0781.php	2012-02-09 20:24:11.000000000 +0000
@@ -2,10 +2,10 @@
 
 
 /*
- * @version $Id: update_078_0781.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: update_078_0781.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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_0781_0782.php glpi-0.80.7/install/update_0781_0782.php
--- glpi-0.80.5/install/update_0781_0782.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_0781_0782.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: update_0781_0782.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: update_0781_0782.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_0782_080.php glpi-0.80.7/install/update_0782_080.php
--- glpi-0.80.5/install/update_0782_080.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_0782_080.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: update_0782_080.php 15215 2011-08-05 05:37:51Z remi $
+ * @version $Id: update_0782_080.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_080_0801.php glpi-0.80.7/install/update_080_0801.php
--- glpi-0.80.5/install/update_080_0801.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_080_0801.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: update_080_0801.php 15519 2011-08-30 06:32:24Z moyo $
+ * @version $Id: update_080_0801.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_0801_0803.php glpi-0.80.7/install/update_0801_0803.php
--- glpi-0.80.5/install/update_0801_0803.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_0801_0803.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: update_0801_0803.php 15852 2011-10-11 06:22:59Z yllen $
+ * @version $Id: update_0801_0803.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update_content.php glpi-0.80.7/install/update_content.php
--- glpi-0.80.5/install/update_content.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_content.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: update_content.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: update_content.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/install/update.php glpi-0.80.7/install/update.php
--- glpi-0.80.5/install/update.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: update.php 15938 2011-10-25 13:17:42Z moyo $
+ * @version $Id: update.php 17459 2012-02-09 20:17:17Z 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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -728,6 +727,9 @@
       case "0.80.3" :
       case "0.80.4" :
       case "0.80.5" :
+      case "0.80.6" :
+      case "0.80.61" :
+      case "0.80.7" :
          break;
 
       default :
@@ -759,7 +761,7 @@
 
    // Update version number and default langage and new version_founded ---- LEAVE AT THE END
    $query = "UPDATE `glpi_configs`
-             SET `version` = ' 0.80.5',
+             SET `version` = ' 0.80.7',
                  `language` = '".$glpilanguage."',
                  `founded_new_version` = '' ;";
    $DB->query($query) or die("0.80 ".$LANG['update'][90].$DB->error());
diff -Nru glpi-0.80.5/install/update_to_031.php glpi-0.80.7/install/update_to_031.php
--- glpi-0.80.5/install/update_to_031.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/install/update_to_031.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: update_to_031.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: update_to_031.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/locales/bg_BG.php glpi-0.80.7/locales/bg_BG.php
--- glpi-0.80.5/locales/bg_BG.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/bg_BG.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: bg_BG.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: bg_BG.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //bg_BG
 
diff -Nru glpi-0.80.5/locales/ca_CA.php glpi-0.80.7/locales/ca_CA.php
--- glpi-0.80.5/locales/ca_CA.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/ca_CA.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: ca_CA.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: ca_CA.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //ca_CA
 
diff -Nru glpi-0.80.5/locales/cs_CZ.php glpi-0.80.7/locales/cs_CZ.php
--- glpi-0.80.5/locales/cs_CZ.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/cs_CZ.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: cs_CZ.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: cs_CZ.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //cs_CZ
 
diff -Nru glpi-0.80.5/locales/de_DE.php glpi-0.80.7/locales/de_DE.php
--- glpi-0.80.5/locales/de_DE.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/de_DE.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: de_DE.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: de_DE.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //de_DE
 
diff -Nru glpi-0.80.5/locales/dk_DK.php glpi-0.80.7/locales/dk_DK.php
--- glpi-0.80.5/locales/dk_DK.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/dk_DK.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: dk_DK.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: dk_DK.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //dk_DK
 
diff -Nru glpi-0.80.5/locales/ee_ET.php glpi-0.80.7/locales/ee_ET.php
--- glpi-0.80.5/locales/ee_ET.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/ee_ET.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: ee_ET.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: ee_ET.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //ee_ET
 
@@ -1886,7 +1885,7 @@
 $LANG['setup'][604]="Lisa kasutaja gruppi"; 
 $LANG['setup'][605]="Lisa kasutajale profiil"; 
 $LANG['setup'][606]="Unable to add. The user already exists."; // en_GB string to be translated
-$LANG['setup'][607]="Associate to a profile"; // en_GB string to be translated
+$LANG['setup'][607]="Lisa profiil"; 
 $LANG['setup'][608]="Software associable to a ticket by default"; // en_GB string to be translated
 $LANG['setup'][609]="Unable to add. The OCSNG server already exists."; // en_GB string to be translated
 $LANG['setup'][610]="Teate pealkiri kohustuslik"; 
diff -Nru glpi-0.80.5/locales/el_EL.php glpi-0.80.7/locales/el_EL.php
--- glpi-0.80.5/locales/el_EL.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/el_EL.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: el_EL.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: el_EL.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //el_EL
 
diff -Nru glpi-0.80.5/locales/en_GB.php glpi-0.80.7/locales/en_GB.php
--- glpi-0.80.5/locales/en_GB.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/en_GB.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: en_GB.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: en_GB.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //en_GB
 
diff -Nru glpi-0.80.5/locales/es_AR.php glpi-0.80.7/locales/es_AR.php
--- glpi-0.80.5/locales/es_AR.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/es_AR.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: es_AR.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: es_AR.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //es_AR
 
diff -Nru glpi-0.80.5/locales/es_ES.php glpi-0.80.7/locales/es_ES.php
--- glpi-0.80.5/locales/es_ES.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/es_ES.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: es_ES.php 15863 2011-10-18 06:17:10Z moyo $ 
+ * @version $Id: es_ES.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //es_ES
 
diff -Nru glpi-0.80.5/locales/es_MX.php glpi-0.80.7/locales/es_MX.php
--- glpi-0.80.5/locales/es_MX.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/es_MX.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: es_MX.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: es_MX.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //es_MX
 
diff -Nru glpi-0.80.5/locales/es_VE.php glpi-0.80.7/locales/es_VE.php
--- glpi-0.80.5/locales/es_VE.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/es_VE.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: es_VE.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: es_VE.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //es_VE
 
diff -Nru glpi-0.80.5/locales/eu_ES.php glpi-0.80.7/locales/eu_ES.php
--- glpi-0.80.5/locales/eu_ES.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/eu_ES.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: eu_ES.php 15911 2011-10-25 06:00:02Z moyo $ 
+ * @version $Id: eu_ES.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //eu_ES
 
diff -Nru glpi-0.80.5/locales/fa_IR.php glpi-0.80.7/locales/fa_IR.php
--- glpi-0.80.5/locales/fa_IR.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/fa_IR.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: fa_IR.php 15863 2011-10-18 06:17:10Z moyo $ 
+ * @version $Id: fa_IR.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //fa_IR
 
diff -Nru glpi-0.80.5/locales/fr_FR.php glpi-0.80.7/locales/fr_FR.php
--- glpi-0.80.5/locales/fr_FR.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/fr_FR.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: fr_FR.php 15736 2011-09-21 19:32:47Z moyo $
+ * @version $Id: fr_FR.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 //fr_FR
diff -Nru glpi-0.80.5/locales/gl_ES.php glpi-0.80.7/locales/gl_ES.php
--- glpi-0.80.5/locales/gl_ES.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/gl_ES.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: gl_ES.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: gl_ES.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //gl_ES
 
diff -Nru glpi-0.80.5/locales/he_HE.php glpi-0.80.7/locales/he_HE.php
--- glpi-0.80.5/locales/he_HE.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/he_HE.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: he_HE.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: he_HE.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //he_HE
 
diff -Nru glpi-0.80.5/locales/hr_HR.php glpi-0.80.7/locales/hr_HR.php
--- glpi-0.80.5/locales/hr_HR.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/hr_HR.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: hr_HR.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: hr_HR.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //hr_HR
 
diff -Nru glpi-0.80.5/locales/hu_HU.php glpi-0.80.7/locales/hu_HU.php
--- glpi-0.80.5/locales/hu_HU.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/hu_HU.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: hu_HU.php 15863 2011-10-18 06:17:10Z moyo $ 
+ * @version $Id: hu_HU.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //hu_HU
 
diff -Nru glpi-0.80.5/locales/it_IT.php glpi-0.80.7/locales/it_IT.php
--- glpi-0.80.5/locales/it_IT.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/it_IT.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: it_IT.php 15863 2011-10-18 06:17:10Z moyo $ 
+ * @version $Id: it_IT.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //it_IT
 
diff -Nru glpi-0.80.5/locales/ja_JP.php glpi-0.80.7/locales/ja_JP.php
--- glpi-0.80.5/locales/ja_JP.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/ja_JP.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: ja_JP.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: ja_JP.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //ja_JP
 
diff -Nru glpi-0.80.5/locales/lt_LT.php glpi-0.80.7/locales/lt_LT.php
--- glpi-0.80.5/locales/lt_LT.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/lt_LT.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: lt_LT.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: lt_LT.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //lt_LT
 
diff -Nru glpi-0.80.5/locales/lv_LV.php glpi-0.80.7/locales/lv_LV.php
--- glpi-0.80.5/locales/lv_LV.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/lv_LV.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: lv_LV.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: lv_LV.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //lv_LV
 
diff -Nru glpi-0.80.5/locales/nl_NL.php glpi-0.80.7/locales/nl_NL.php
--- glpi-0.80.5/locales/nl_NL.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/nl_NL.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: nl_NL.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: nl_NL.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //nl_NL
 
diff -Nru glpi-0.80.5/locales/no_NB.php glpi-0.80.7/locales/no_NB.php
--- glpi-0.80.5/locales/no_NB.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/no_NB.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: no_NB.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: no_NB.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
  -------------------------------------------------------------------------
 
@@ -23,23 +23,22 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //no_NB
 
 $LANG=array();
 
 
-$LANG['backup'][0]="SQL nedlastning"; 
+$LANG['backup'][0]="Dump SQL"; 
 $LANG['backup'][1]="XML nedlastning"; 
 $LANG['backup'][11]="Størrelse"; 
 $LANG['backup'][13]="Vis/Last ned"; 
 $LANG['backup'][16]="Replace the current database with the backup file ?"; // en_GB string to be translated
 $LANG['backup'][17]="Delete this file ?"; // en_GB string to be translated
 $LANG['backup'][18]="Backup the database ?"; // en_GB string to be translated
-$LANG['backup'][21]="Fila eksisterer allerede"; 
+$LANG['backup'][21]="Filen eksisterer allerede"; 
 $LANG['backup'][22]="Kan ikke finne byte"; 
 $LANG['backup'][23]="Mysql feil starter ved"; 
 $LANG['backup'][24]="Automatisk omdirigering, Else klikk"; 
@@ -68,11 +67,11 @@
 $LANG['buttons'][15]="Planlegge"; 
 $LANG['buttons'][16]="Blank"; 
 $LANG['buttons'][17]="Invertere valget"; 
-$LANG['buttons'][18]="Sjekk Alle"; 
+$LANG['buttons'][18]="Sjekk alle"; 
 $LANG['buttons'][19]="Fjern alle markeringer"; 
 $LANG['buttons'][20]="Flytt"; 
-$LANG['buttons'][21]="Gjennopprette"; 
-$LANG['buttons'][22]="Utrensing"; 
+$LANG['buttons'][21]="Gjenopprette"; 
+$LANG['buttons'][22]="Slett"; 
 $LANG['buttons'][23]="Vis"; 
 $LANG['buttons'][24]="Gå opp"; 
 $LANG['buttons'][25]="Gå ned"; 
@@ -120,10 +119,10 @@
 $LANG['calendar'][8]="Can not add a range riding an existing period"; // en_GB string to be translated
 $LANG['calendar'][10]="Time ranges"; // en_GB string to be translated
 $LANG['calendar'][11]="Close times"; // en_GB string to be translated
-$LANG['calendar'][12]="day(s)"; // en_GB string to be translated
+$LANG['calendar'][12]="dag(er)"; 
 $LANG['calendar'][13]="week(s)"; // en_GB string to be translated
 $LANG['calendar'][14]="month(s)"; // en_GB string to be translated / singular (plural) like month(s)
-$LANG['calendar'][15]="year(s)"; // en_GB string to be translated
+$LANG['calendar'][15]="år"; 
 $LANG['calendar'][16]="Now"; // en_GB string to be translated
 $LANG['calendar'][17]="Specify a date"; // en_GB string to be translated
 
@@ -189,7 +188,7 @@
 $LANG['central'][8]="Utvidelse"; 
 $LANG['central'][9]="Dine oppgaver blir behandlet"; 
 $LANG['central'][10]="Ny oppgave"; 
-$LANG['central'][12]="Persjonelig oversikt"; 
+$LANG['central'][12]="Personlig oversikt"; 
 $LANG['central'][13]="Global oversikt"; 
 $LANG['central'][14]="Gruppe oversikt"; 
 $LANG['central'][18]="Your tickets to close"; // en_GB string to be translated
@@ -295,7 +294,7 @@
 $LANG['common'][92]="Alternate username"; // en_GB string to be translated
 $LANG['common'][93]="New child heading"; // en_GB string to be translated
 $LANG['common'][94]="URL"; // en_GB string to be translated
-$LANG['common'][95]="By"; // en_GB string to be translated
+$LANG['common'][95]="Av"; 
 $LANG['common'][96]="Items"; // en_GB string to be translated
 $LANG['common'][97]="Linked to"; // en_GB string to be translated
 $LANG['common'][98]="duplicates"; // en_GB string to be translated
@@ -336,7 +335,7 @@
 $LANG['computers'][52]="Version of the operating system"; // en_GB string to be translated
 $LANG['computers'][53]="Service pakke"; 
 $LANG['computers'][54]="Ingen telefon tilkoblet"; 
-$LANG['computers'][55]="Add a virtual machine"; // en_GB string to be translated
+$LANG['computers'][55]="Legg til virtuell maskin"; 
 $LANG['computers'][56]="Status updated. The connected items have been updated using this status."; // en_GB string to be translated
 $LANG['computers'][57]="Virtual machines"; // en_GB string to be translated
 $LANG['computers'][58]="UUID"; // en_GB string to be translated
@@ -469,7 +468,7 @@
 $LANG['device_ram'][1]="Frekvens"; 
 $LANG['device_ram'][2]="Størrelse"; 
 
-$LANG['document'][1]="Checksum (SHA1)"; // en_GB string to be translated
+$LANG['document'][1]="Sjekksum (SHA1)"; 
 $LANG['document'][2]="Fil"; 
 $LANG['document'][3]="Overskrift"; 
 $LANG['document'][4]="MIME type"; 
@@ -795,7 +794,7 @@
 $LANG['job'][13]="New ticket"; // en_GB string to be translated
 $LANG['job'][14]="Opened"; // en_GB string to be translated
 $LANG['job'][15]="Solved"; // en_GB string to be translated
-$LANG['job'][16]="Closed"; // en_GB string to be translated
+$LANG['job'][16]="Lukket"; 
 $LANG['job'][17]="Late"; // en_GB string to be translated
 $LANG['job'][18]="Requesters"; // en_GB string to be translated
 $LANG['job'][19]="Epost oppfølging"; 
@@ -1100,7 +1099,7 @@
 $LANG['mailing'][115]="Email body"; // en_GB string to be translated
 $LANG['mailing'][116]="HTML"; // en_GB string to be translated
 $LANG['mailing'][117]="text"; // en_GB string to be translated
-$LANG['mailing'][118]="Email"; // en_GB string to be translated
+$LANG['mailing'][118]="E-post"; 
 $LANG['mailing'][119]="Occurrence"; // en_GB string to be translated
 $LANG['mailing'][120]="Notification method"; // en_GB string to be translated
 $LANG['mailing'][121]="Recipients"; // en_GB string to be translated
@@ -1112,7 +1111,7 @@
 $LANG['mailing'][127]="Closing of the ticket"; // en_GB string to be translated
 $LANG['mailing'][128]="leave the field empty for a generation from HTML"; // en_GB string to be translated
 $LANG['mailing'][129]="Deletion of a ticket"; // en_GB string to be translated
-$LANG['mailing'][130]="From"; // en_GB string to be translated
+$LANG['mailing'][130]="Fra"; 
 $LANG['mailing'][131]="Recipient"; // en_GB string to be translated
 $LANG['mailing'][132]="Email header"; // en_GB string to be translated
 $LANG['mailing'][133]="Delete email(s)"; // en_GB string to be translated
@@ -1138,7 +1137,7 @@
 $LANG['Menu'][4]="Programvare"; // Plural
 $LANG['Menu'][5]="Tickets"; // en_GB string to be translated
 $LANG['Menu'][6]="Rapporter"; 
-$LANG['Menu'][11]="Instillinger"; 
+$LANG['Menu'][11]="Preferanser"; 
 $LANG['Menu'][12]="Maintenance"; // en_GB string to be translated
 $LANG['Menu'][13]="Statistikk"; 
 $LANG['Menu'][14]="Brukere"; 
@@ -1212,7 +1211,7 @@
 $LANG['ocsconfig'][2]="Host for the OCSNG database"; // en_GB string to be translated
 $LANG['ocsconfig'][3]="OCSNG user password"; // en_GB string to be translated
 $LANG['ocsconfig'][4]="Name of the OCSNG database"; // en_GB string to be translated
-$LANG['ocsconfig'][5]="Import Instillinger"; 
+$LANG['ocsconfig'][5]="Import innstillinger"; 
 $LANG['ocsconfig'][7]="OCSNG database in UTF8"; // en_GB string to be translated
 $LANG['ocsconfig'][9]="Utelat følgende koder (separator $ ingenting for alle)"; 
 $LANG['ocsconfig'][10]="Global import"; 
@@ -1419,7 +1418,7 @@
 $LANG['profiles'][48]="Create a validation request"; // en_GB string to be translated
 $LANG['profiles'][49]="Validate a ticket"; // en_GB string to be translated
 $LANG['profiles'][50]="Update my followups"; // en_GB string to be translated
-$LANG['profiles'][51]="Delete all followups"; // en_GB string to be translated
+$LANG['profiles'][51]="Slett alle oppfølginger"; 
 
 $LANG['registry'][1]="Hive"; 
 $LANG['registry'][2]="Sti"; 
@@ -1849,7 +1848,7 @@
 $LANG['setup'][282]="When disconnecting"; // en_GB string to be translated
 $LANG['setup'][283]="Kopier"; 
 $LANG['setup'][284]="Fjern"; 
-$LANG['setup'][285]="Do not copy"; // en_GB string to be translated
+$LANG['setup'][285]="Ikke kopier"; 
 $LANG['setup'][286]="Do not delete"; // en_GB string to be translated
 $LANG['setup'][290]="Automatic transfer of computers"; // en_GB string to be translated
 $LANG['setup'][291]="Template for the automatic transfer of computers in another entity"; // en_GB string to be translated
@@ -2096,7 +2095,7 @@
 $LANG['users'][5]="You have been made a request to reset your account password."; // en_GB string to be translated
 $LANG['users'][6]="Just follow this link (you have one day) :"; // en_GB string to be translated
 $LANG['users'][7]="Please enter your email address. A email will be sent to you and you will be able to choose a new password."; // en_GB string to be translated
-$LANG['users'][8]="Email address not found."; // en_GB string to be translated
+$LANG['users'][8]="E-post adresse ikke funnet."; 
 $LANG['users'][9]="The authentication method configuration doesn't allow you to change your password."; // en_GB string to be translated
 $LANG['users'][10]="An email has been sent to your email address. The email contains informations for reset your password."; // en_GB string to be translated
 $LANG['users'][11]="Please confirm your email address and enter your new password."; // en_GB string to be translated
@@ -2116,16 +2115,16 @@
 $LANG['validation'][6]="Approval comment"; // en_GB string to be translated
 $LANG['validation'][7]="Approval(s) for the ticket"; // en_GB string to be translated
 $LANG['validation'][8]="Validations"; // en_GB string to be translated
-$LANG['validation'][9]="Waiting for approval"; // en_GB string to be translated
+$LANG['validation'][9]="Venter på godkjennelse"; 
 $LANG['validation'][10]="Refused"; // en_GB string to be translated
-$LANG['validation'][11]="Granted"; // en_GB string to be translated
+$LANG['validation'][11]="Akseptert"; 
 $LANG['validation'][12]="Not subject to approval"; // en_GB string to be translated
 $LANG['validation'][13]="Approval request sent to"; // en_GB string to be translated
 $LANG['validation'][15]="Ticket waiting for your Approval"; // en_GB string to be translated
 $LANG['validation'][16]="Optional when approved"; // en_GB string to be translated
 $LANG['validation'][18]="Approval requester"; // en_GB string to be translated
 $LANG['validation'][19]="Approval granted"; // en_GB string to be translated
-$LANG['validation'][21]="Approver"; // en_GB string to be translated
+$LANG['validation'][21]="Godkjenner"; 
 $LANG['validation'][23]="The selected user has no valid email address. The request has been created, without email confirmation."; // en_GB string to be translated
 $LANG['validation'][25]="Global validation status"; // en_GB string to be translated
 $LANG['validation'][26]="Approval request"; // en_GB string to be translated
diff -Nru glpi-0.80.5/locales/no_NN.php glpi-0.80.7/locales/no_NN.php
--- glpi-0.80.5/locales/no_NN.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/no_NN.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: no_NN.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: no_NN.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //no_NN
 
diff -Nru glpi-0.80.5/locales/pl_PL.php glpi-0.80.7/locales/pl_PL.php
--- glpi-0.80.5/locales/pl_PL.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/pl_PL.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: pl_PL.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: pl_PL.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //pl_PL
 
diff -Nru glpi-0.80.5/locales/pt_BR.php glpi-0.80.7/locales/pt_BR.php
--- glpi-0.80.5/locales/pt_BR.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/pt_BR.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: pt_BR.php 15863 2011-10-18 06:17:10Z moyo $ 
+ * @version $Id: pt_BR.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //pt_BR
 
diff -Nru glpi-0.80.5/locales/pt_PT.php glpi-0.80.7/locales/pt_PT.php
--- glpi-0.80.5/locales/pt_PT.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/pt_PT.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: pt_PT.php 15863 2011-10-18 06:17:10Z moyo $ 
+ * @version $Id: pt_PT.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //pt_PT
 
diff -Nru glpi-0.80.5/locales/ro_RO.php glpi-0.80.7/locales/ro_RO.php
--- glpi-0.80.5/locales/ro_RO.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/ro_RO.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: ro_RO.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: ro_RO.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //ro_RO
 
diff -Nru glpi-0.80.5/locales/ru_RU.php glpi-0.80.7/locales/ru_RU.php
--- glpi-0.80.5/locales/ru_RU.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/ru_RU.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: ru_RU.php 15863 2011-10-18 06:17:10Z moyo $ 
+ * @version $Id: ru_RU.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //ru_RU
 
diff -Nru glpi-0.80.5/locales/sk_SK.php glpi-0.80.7/locales/sk_SK.php
--- glpi-0.80.5/locales/sk_SK.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/sk_SK.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: sk_SK.php 15863 2011-10-18 06:17:10Z moyo $ 
+ * @version $Id: sk_SK.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //sk_SK
 
@@ -1542,7 +1541,7 @@
 $LANG['rulesengine'][50]="Číselník modelov PC"; 
 $LANG['rulesengine'][51]="Číselník modelov monitorov"; 
 $LANG['rulesengine'][52]="Číselník modelov telefónov"; 
-$LANG['rulesengine'][53]="Číselník modelov periférií"; 
+$LANG['rulesengine'][53]="Číselník modelov zariadení"; 
 $LANG['rulesengine'][54]="Číselník modelov tlačiarní"; 
 $LANG['rulesengine'][55]="Číselník modelov sietí"; 
 $LANG['rulesengine'][56]="Modely"; 
@@ -1550,7 +1549,7 @@
 $LANG['rulesengine'][60]="Číselník typov PC"; 
 $LANG['rulesengine'][61]="Číselník typov monitorov"; 
 $LANG['rulesengine'][62]="Číselník typov telefónov"; 
-$LANG['rulesengine'][63]="Číselník typov periférií"; 
+$LANG['rulesengine'][63]="Číselník typov zariadení"; 
 $LANG['rulesengine'][64]="Číselník typov tlačiarní"; 
 $LANG['rulesengine'][65]="Číselník sieťových zariadení"; 
 $LANG['rulesengine'][66]="Typy"; 
@@ -1705,7 +1704,7 @@
 $LANG['setup'][94]="Modely monitorov"; 
 $LANG['setup'][95]="Modely siete"; 
 $LANG['setup'][96]="Modely tlačiarní"; 
-$LANG['setup'][97]="Modely periférií"; 
+$LANG['setup'][97]="Modely zariadení"; 
 $LANG['setup'][98]="Kategória úloh"; 
 $LANG['setup'][99]="Číslo budovy"; 
 $LANG['setup'][100]="Miestnosť číslo"; 
diff -Nru glpi-0.80.5/locales/sl_SI.php glpi-0.80.7/locales/sl_SI.php
--- glpi-0.80.5/locales/sl_SI.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/sl_SI.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: sl_SI.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: sl_SI.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //sl_SI
 
diff -Nru glpi-0.80.5/locales/sv_SE.php glpi-0.80.7/locales/sv_SE.php
--- glpi-0.80.5/locales/sv_SE.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/sv_SE.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: sv_SE.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: sv_SE.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //sv_SE
 
diff -Nru glpi-0.80.5/locales/tr_TR.php glpi-0.80.7/locales/tr_TR.php
--- glpi-0.80.5/locales/tr_TR.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/tr_TR.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: tr_TR.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: tr_TR.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //tr_TR
 
diff -Nru glpi-0.80.5/locales/ua_UA.php glpi-0.80.7/locales/ua_UA.php
--- glpi-0.80.5/locales/ua_UA.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/ua_UA.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: ua_UA.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: ua_UA.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //ua_UA
 
diff -Nru glpi-0.80.5/locales/zh_CN.php glpi-0.80.7/locales/zh_CN.php
--- glpi-0.80.5/locales/zh_CN.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/zh_CN.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: zh_CN.php 15737 2011-09-21 19:39:19Z moyo $ 
+ * @version $Id: zh_CN.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //zh_CN
 
diff -Nru glpi-0.80.5/locales/zh_TW.php glpi-0.80.7/locales/zh_TW.php
--- glpi-0.80.5/locales/zh_TW.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/locales/zh_TW.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php 
 /*
- * @version $Id: zh_TW.php 15771 2011-09-27 06:39:53Z moyo $ 
+ * @version $Id: zh_TW.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
  -------------------------------------------------------------------------
 
@@ -23,9 +23,8 @@
  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 <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
  */
 //zh_TW
 
@@ -37,16 +36,16 @@
 $LANG['backup'][11]="大小"; 
 $LANG['backup'][13]="檢視/下載"; 
 $LANG['backup'][16]="由備份檔覆蓋還原目前的資料庫:"; 
-$LANG['backup'][17]="刪除這個檔案"; 
-$LANG['backup'][18]="備份資料庫"; 
+$LANG['backup'][17]="刪除這個檔案 ?"; 
+$LANG['backup'][18]="備份資料庫 ?"; 
 $LANG['backup'][21]="文件已經存在"; 
 $LANG['backup'][22]="找不到位元組"; 
 $LANG['backup'][23]="Mysql 錯誤從"; 
-$LANG['backup'][24]="自動重定向，否則點擊"; 
+$LANG['backup'][24]="自動重定向，否則點選"; 
 
 $LANG['bookmark'][1]="書籤"; 
-$LANG['bookmark'][2]="局部載入的書籤"; 
-$LANG['bookmark'][3]="您目前沒有記錄任何書籤."; 
+$LANG['bookmark'][2]="載入部份的書籤"; 
+$LANG['bookmark'][3]="您目前沒有任何書籤的記錄."; 
 $LANG['bookmark'][4]="新增書籤"; 
 $LANG['bookmark'][5]="公用書籤"; 
 $LANG['bookmark'][6]="預設檢視"; 
@@ -113,7 +112,7 @@
 $LANG['calendar'][0]="YYYY-MM-DD"; 
 $LANG['calendar'][1]="DD-MM-YYYY"; 
 $LANG['calendar'][2]="MM-DD-YYYY"; 
-$LANG['calendar'][3]="遞歸"; 
+$LANG['calendar'][3]="遞迴"; 
 $LANG['calendar'][5]="時間範圍"; 
 $LANG['calendar'][6]="新增一個日程表"; 
 $LANG['calendar'][7]="日"; 
@@ -707,9 +706,9 @@
 $LANG['install'][17]="文件無法創建。"; 
 $LANG['install'][18]="非官方的翻譯也可"; 
 $LANG['install'][19]="文件創建了但不能被刪除。"; 
-$LANG['install'][20]="文件和檔案已被創建並刪除 - 漂亮 !"; 
+$LANG['install'][20]="文件和檔案已被創建並刪除 - 完成 !"; 
 $LANG['install'][21]="測試文件檔寫入的權限"; 
-$LANG['install'][22]="文件已被創建 - 漂亮 !"; 
+$LANG['install'][22]="文件已被創建 - 完成 !"; 
 $LANG['install'][23]="測試設定檔寫入權限"; 
 $LANG['install'][24]="初始化資料庫"; 
 $LANG['install'][25]="繼續？"; 
@@ -1585,7 +1584,7 @@
 $LANG['rulesengine'][105]="修改後的值"; 
 $LANG['rulesengine'][106]="未變更"; 
 $LANG['rulesengine'][107]="停用"; 
-$LANG['rulesengine'][108]="原本"; 
+$LANG['rulesengine'][108]="原始的"; 
 $LANG['rulesengine'][110]="權利移轉"; 
 $LANG['rulesengine'][111]="實體移轉"; 
 $LANG['rulesengine'][112]="權利和實體移轉"; 
diff -Nru glpi-0.80.5/login.php glpi-0.80.7/login.php
--- glpi-0.80.5/login.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/login.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: login.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: login.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/logout.php glpi-0.80.7/logout.php
--- glpi-0.80.5/logout.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/logout.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * @version $Id: logout.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: logout.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
  -------------------------------------------------------------------------
@@ -24,8 +24,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
@@ -43,7 +42,7 @@
     && isset($_SESSION["glpiauthtype"])
     && $_SESSION["glpiauthtype"]==Auth::CAS) {
 
-   include (GLPI_ROOT . "/lib/phpcas/CAS.php");
+   include (GLPI_PHPCAS);
    phpCAS::client(CAS_VERSION_2_0, $CFG_GLPI["cas_host"], intval($CFG_GLPI["cas_port"]),
                   $CFG_GLPI["cas_uri"], false);
    phpCAS::setServerLogoutURL(strval($CFG_GLPI["cas_logout"]));
diff -Nru glpi-0.80.5/scripts/compute_dictionnary.php glpi-0.80.7/scripts/compute_dictionnary.php
--- glpi-0.80.5/scripts/compute_dictionnary.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/scripts/compute_dictionnary.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: compute_dictionnary.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: compute_dictionnary.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/scripts/ldap_mass_sync.php glpi-0.80.7/scripts/ldap_mass_sync.php
--- glpi-0.80.5/scripts/ldap_mass_sync.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/scripts/ldap_mass_sync.php	2012-02-09 20:24:12.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: ldap_mass_sync.php 15848 2011-10-10 11:28:56Z remi $
+ * @version $Id: ldap_mass_sync.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/scripts/softcat_mass_compute.php glpi-0.80.7/scripts/softcat_mass_compute.php
--- glpi-0.80.5/scripts/softcat_mass_compute.php	2011-10-25 13:20:00.000000000 +0000
+++ glpi-0.80.7/scripts/softcat_mass_compute.php	2012-02-09 20:24:12.000000000 +0000
@@ -2,10 +2,10 @@
 
 
 /*
- * @version $Id: softcat_mass_compute.php 14684 2011-06-11 06:32:40Z remi $
+ * @version $Id: softcat_mass_compute.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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
diff -Nru glpi-0.80.5/status.php glpi-0.80.7/status.php
--- glpi-0.80.5/status.php	2011-10-25 13:19:59.000000000 +0000
+++ glpi-0.80.7/status.php	2012-02-09 20:24:11.000000000 +0000
@@ -1,9 +1,9 @@
 <?php
 /*
- * @version $Id: status.php 15403 2011-08-12 17:20:56Z walid $
+ * @version $Id: status.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
  -------------------------------------------------------------------------
@@ -23,8 +23,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 <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */