diff -Nur web/glpi/glpi/backups/CVS/Entries glpi/backups/CVS/Entries
--- web/glpi/glpi/backups/CVS/Entries 2005-03-04 09:50:47.000000000 +0100
+++ glpi/backups/CVS/Entries 2005-03-07 14:02:47.000000000 +0100
@@ -1,4 +1,4 @@
-/_relpos.php/1.4/Sat Feb 12 16:00:10 2005//
-/genxml.php/1.8/Sat Feb 12 16:00:10 2005//
-/index.php/1.41/Mon Feb 28 23:44:29 2005//
-D/dump////
+/_relpos.php/1.5/Mon Mar 7 10:44:24 2005//
+/genxml.php/1.9/Mon Mar 7 10:44:24 2005//
+/index.php/1.42/Mon Mar 7 10:44:24 2005//
+D
diff -Nur web/glpi/glpi/backups/CVS/Entries.Log glpi/backups/CVS/Entries.Log
--- web/glpi/glpi/backups/CVS/Entries.Log 1970-01-01 01:00:00.000000000 +0100
+++ glpi/backups/CVS/Entries.Log 2005-03-07 14:02:47.000000000 +0100
@@ -0,0 +1 @@
+A D/dump////
diff -Nur web/glpi/glpi/backups/dump/CVS/Entries glpi/backups/dump/CVS/Entries
--- web/glpi/glpi/backups/dump/CVS/Entries 2005-03-04 09:45:50.000000000 +0100
+++ glpi/backups/dump/CVS/Entries 2005-03-07 14:02:47.000000000 +0100
@@ -1,2 +1,3 @@
+/.htaccess/1.2/Mon Mar 7 11:14:43 2005//
/remove.txt/1.1/Tue Jan 27 21:03:17 2004//
D
diff -Nur web/glpi/glpi/backups/dump/.htaccess glpi/backups/dump/.htaccess
--- web/glpi/glpi/backups/dump/.htaccess 1970-01-01 01:00:00.000000000 +0100
+++ glpi/backups/dump/.htaccess 2005-03-07 12:14:43.000000000 +0100
@@ -0,0 +1,3 @@
+
+
+
diff -Nur web/glpi/glpi/backups/genxml.php glpi/backups/genxml.php
--- web/glpi/glpi/backups/genxml.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/backups/genxml.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,16 +1,16 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/backups/index.php glpi/backups/index.php
--- web/glpi/glpi/backups/index.php 2005-03-01 00:44:29.000000000 +0100
+++ glpi/backups/index.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,16 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -25,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/backups/_relpos.php glpi/backups/_relpos.php
--- web/glpi/glpi/backups/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/backups/_relpos.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/cartridges/cartridge-edit.php glpi/cartridges/cartridge-edit.php
--- web/glpi/glpi/cartridges/cartridge-edit.php 2005-02-25 11:42:34.000000000 +0100
+++ glpi/cartridges/cartridge-edit.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/cartridges/cartridge-info-form.php glpi/cartridges/cartridge-info-form.php
--- web/glpi/glpi/cartridges/cartridge-info-form.php 2005-03-03 16:21:58.000000000 +0100
+++ glpi/cartridges/cartridge-info-form.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/cartridges/cartridge-search.php glpi/cartridges/cartridge-search.php
--- web/glpi/glpi/cartridges/cartridge-search.php 2005-03-03 16:21:58.000000000 +0100
+++ glpi/cartridges/cartridge-search.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/cartridges/CVS/Entries glpi/cartridges/CVS/Entries
--- web/glpi/glpi/cartridges/CVS/Entries 2005-03-04 09:45:50.000000000 +0100
+++ glpi/cartridges/CVS/Entries 2005-03-07 14:02:48.000000000 +0100
@@ -1,6 +1,6 @@
-/_relpos.php/1.1/Sun Feb 13 16:53:28 2005//
-/cartridge-edit.php/1.3/Fri Feb 25 10:42:34 2005//
-/cartridge-info-form.php/1.6/Thu Mar 3 15:21:58 2005//
-/cartridge-search.php/1.4/Thu Mar 3 15:21:58 2005//
-/index.php/1.3/Thu Mar 3 15:21:58 2005//
+/_relpos.php/1.2/Mon Mar 7 10:44:24 2005//
+/cartridge-edit.php/1.4/Mon Mar 7 10:44:24 2005//
+/cartridge-info-form.php/1.7/Mon Mar 7 10:44:24 2005//
+/cartridge-search.php/1.5/Mon Mar 7 10:44:24 2005//
+/index.php/1.4/Mon Mar 7 10:44:24 2005//
D
diff -Nur web/glpi/glpi/cartridges/index.php glpi/cartridges/index.php
--- web/glpi/glpi/cartridges/index.php 2005-03-03 16:21:58.000000000 +0100
+++ glpi/cartridges/index.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/cartridges/_relpos.php glpi/cartridges/_relpos.php
--- web/glpi/glpi/cartridges/_relpos.php 2005-02-13 17:53:28.000000000 +0100
+++ glpi/cartridges/_relpos.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/central.php glpi/central.php
--- web/glpi/glpi/central.php 2005-02-12 19:57:28.000000000 +0100
+++ glpi/central.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
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
-
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/computers/computers-add-select.php glpi/computers/computers-add-select.php
--- web/glpi/glpi/computers/computers-add-select.php 2005-03-07 09:57:34.000000000 +0100
+++ glpi/computers/computers-add-select.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/computers/computers-info-form.php glpi/computers/computers-info-form.php
--- web/glpi/glpi/computers/computers-info-form.php 2005-03-07 09:57:34.000000000 +0100
+++ glpi/computers/computers-info-form.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/computers/computers-search.php glpi/computers/computers-search.php
--- web/glpi/glpi/computers/computers-search.php 2005-03-07 09:57:34.000000000 +0100
+++ glpi/computers/computers-search.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,28 +1,30 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- GLPI is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+ GLPI is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/computers/CVS/Entries glpi/computers/CVS/Entries
--- web/glpi/glpi/computers/CVS/Entries 2005-03-07 09:57:34.000000000 +0100
+++ glpi/computers/CVS/Entries 2005-03-07 14:02:48.000000000 +0100
@@ -1,6 +1,6 @@
-/_relpos.php/1.4/Sat Feb 12 16:00:10 2005//
-/computers-add-select.php/1.17/Mon Mar 7 08:57:34 2005//
-/computers-info-form.php/1.43/Mon Mar 7 08:57:34 2005//
-/computers-search.php/1.18/Mon Mar 7 08:57:34 2005//
-/index.php/1.18/Mon Mar 7 08:57:34 2005//
+/_relpos.php/1.5/Mon Mar 7 10:44:24 2005//
+/computers-add-select.php/1.18/Mon Mar 7 10:44:24 2005//
+/computers-info-form.php/1.44/Mon Mar 7 10:44:24 2005//
+/computers-search.php/1.19/Mon Mar 7 10:44:24 2005//
+/index.php/1.19/Mon Mar 7 10:44:24 2005//
D
diff -Nur web/glpi/glpi/computers/index.php glpi/computers/index.php
--- web/glpi/glpi/computers/index.php 2005-03-07 09:57:34.000000000 +0100
+++ glpi/computers/index.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/computers/_relpos.php glpi/computers/_relpos.php
--- web/glpi/glpi/computers/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/computers/_relpos.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/conffiles/CVS/Entries glpi/conffiles/CVS/Entries
--- web/glpi/glpi/conffiles/CVS/Entries 1970-01-01 01:00:00.000000000 +0100
+++ glpi/conffiles/CVS/Entries 2005-03-07 14:02:48.000000000 +0100
@@ -0,0 +1 @@
+D
diff -Nur web/glpi/glpi/conffiles/CVS/Repository glpi/conffiles/CVS/Repository
--- web/glpi/glpi/conffiles/CVS/Repository 1970-01-01 01:00:00.000000000 +0100
+++ glpi/conffiles/CVS/Repository 2005-03-07 14:02:48.000000000 +0100
@@ -0,0 +1 @@
+glpi/conffiles
diff -Nur web/glpi/glpi/conffiles/CVS/Root glpi/conffiles/CVS/Root
--- web/glpi/glpi/conffiles/CVS/Root 1970-01-01 01:00:00.000000000 +0100
+++ glpi/conffiles/CVS/Root 2005-03-07 14:02:48.000000000 +0100
@@ -0,0 +1 @@
+:pserver:[EMAIL PROTECTED]
diff -Nur web/glpi/glpi/contacts/contacts-info-form.php glpi/contacts/contacts-info-form.php
--- web/glpi/glpi/contacts/contacts-info-form.php 2005-02-25 12:18:43.000000000 +0100
+++ glpi/contacts/contacts-info-form.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/contacts/contacts-search.php glpi/contacts/contacts-search.php
--- web/glpi/glpi/contacts/contacts-search.php 2005-02-26 22:22:54.000000000 +0100
+++ glpi/contacts/contacts-search.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/contacts/CVS/Entries glpi/contacts/CVS/Entries
--- web/glpi/glpi/contacts/CVS/Entries 2005-03-04 09:45:51.000000000 +0100
+++ glpi/contacts/CVS/Entries 2005-03-07 14:02:48.000000000 +0100
@@ -1,5 +1,5 @@
-/_relpos.php/1.1/Sat Feb 19 02:02:40 2005//
-/contacts-info-form.php/1.2/Fri Feb 25 11:18:43 2005//
-/contacts-search.php/1.2/Sat Feb 26 21:22:54 2005//
-/index.php/1.1/Sat Feb 19 02:02:40 2005//
+/_relpos.php/1.2/Mon Mar 7 10:44:24 2005//
+/contacts-info-form.php/1.3/Mon Mar 7 10:44:24 2005//
+/contacts-search.php/1.3/Mon Mar 7 10:44:24 2005//
+/index.php/1.2/Mon Mar 7 10:44:24 2005//
D
diff -Nur web/glpi/glpi/contacts/index.php glpi/contacts/index.php
--- web/glpi/glpi/contacts/index.php 2005-02-19 03:02:40.000000000 +0100
+++ glpi/contacts/index.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/contacts/_relpos.php glpi/contacts/_relpos.php
--- web/glpi/glpi/contacts/_relpos.php 2005-02-19 03:02:40.000000000 +0100
+++ glpi/contacts/_relpos.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/contracts/contracts-info-form.php glpi/contracts/contracts-info-form.php
--- web/glpi/glpi/contracts/contracts-info-form.php 2005-02-25 12:16:35.000000000 +0100
+++ glpi/contracts/contracts-info-form.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/contracts/contracts-search.php glpi/contracts/contracts-search.php
--- web/glpi/glpi/contracts/contracts-search.php 2005-02-27 00:00:42.000000000 +0100
+++ glpi/contracts/contracts-search.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/contracts/CVS/Entries glpi/contracts/CVS/Entries
--- web/glpi/glpi/contracts/CVS/Entries 2005-03-04 09:45:51.000000000 +0100
+++ glpi/contracts/CVS/Entries 2005-03-07 14:02:48.000000000 +0100
@@ -1,5 +1,5 @@
-/_relpos.php/1.1/Sat Feb 19 19:47:10 2005//
-/contracts-info-form.php/1.4/Fri Feb 25 11:16:35 2005//
-/contracts-search.php/1.3/Sat Feb 26 23:00:42 2005//
-/index.php/1.1/Sat Feb 19 19:47:10 2005//
+/_relpos.php/1.2/Mon Mar 7 10:44:24 2005//
+/contracts-info-form.php/1.5/Mon Mar 7 10:44:24 2005//
+/contracts-search.php/1.4/Mon Mar 7 10:44:24 2005//
+/index.php/1.2/Mon Mar 7 10:44:24 2005//
D
diff -Nur web/glpi/glpi/contracts/index.php glpi/contracts/index.php
--- web/glpi/glpi/contracts/index.php 2005-02-19 20:47:10.000000000 +0100
+++ glpi/contracts/index.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/contracts/_relpos.php glpi/contracts/_relpos.php
--- web/glpi/glpi/contracts/_relpos.php 2005-02-19 20:47:10.000000000 +0100
+++ glpi/contracts/_relpos.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/CVS/Entries glpi/CVS/Entries
--- web/glpi/glpi/CVS/Entries 2005-03-07 09:57:34.000000000 +0100
+++ glpi/CVS/Entries 2005-03-07 14:02:47.000000000 +0100
@@ -3,51 +3,26 @@
/COPYING/1.1/Tue Jan 27 21:03:17 2004//
/Doxyfile/1.1/Fri Feb 18 17:56:48 2005//
/HEADER/1.1/Sat Jan 29 23:31:41 2005//
-/LISEZMOI.txt/1.18/Sat Feb 12 23:04:32 2005//
-/README.txt/1.11/Sat Feb 12 23:04:32 2005//
-/_relpos.php/1.4/Sat Feb 12 16:00:10 2005//
-/central.php/1.17/Sat Feb 12 18:57:28 2005//
-/find_num.php/1.22/Sat Feb 12 16:00:10 2005//
+/LISEZMOI.txt/1.19/Mon Mar 7 10:44:24 2005//
+/README.txt/1.12/Mon Mar 7 10:44:24 2005//
+/_relpos.php/1.5/Mon Mar 7 10:44:24 2005//
+/central.php/1.18/Mon Mar 7 10:44:24 2005//
+/find_num.php/1.23/Mon Mar 7 10:44:24 2005//
/helpdesk.html/1.10/Wed Jan 5 22:37:16 2005//
-/helpdesk.php/1.23/Tue Mar 1 23:05:59 2005//
-/index.php/1.19/Mon Feb 28 23:44:29 2005//
-/install.php/1.57/Mon Feb 14 22:56:22 2005//
-/login.php/1.22/Sat Feb 12 16:00:10 2005//
-/logout.php/1.6/Sat Feb 12 16:00:10 2005//
+/helpdesk.php/1.24/Mon Mar 7 10:44:24 2005//
+/index.php/1.20/Mon Mar 7 10:44:24 2005//
+/install.php/1.58/Mon Mar 7 10:44:24 2005//
+/login.php/1.23/Mon Mar 7 10:44:24 2005//
+/logout.php/1.7/Mon Mar 7 10:44:24 2005//
/make_release.sh/1.2/Wed Feb 16 23:44:14 2005//
-/modify_headers.pl/1.3/Sat Feb 12 16:00:10 2005//
-/mycalendar.php/1.14/Sat Feb 12 16:00:10 2005//
+/modify_headers.pl/1.4/Mon Mar 7 10:44:24 2005//
+/mycalendar.php/1.15/Mon Mar 7 10:44:24 2005//
/print.css/1.1/Fri Sep 17 17:30:40 2004//
/script.js/1.1/Sun Nov 14 14:43:21 2004//
-/update_content.php/1.12/Sat Feb 12 16:00:10 2005//
-/update_lieux.php/1.5/Tue Feb 15 13:17:07 2005//
-D/backups////
-D/cartridges////
-D/computers////
-D/conffiles////
-D/contacts////
-D/contracts////
-D/enterprises////
-D/glpi////
-D/help////
-D/helpdesk////
-D/infocoms////
-D/knowbase////
-D/ldap////
-D/monitors////
-D/mysql////
-D/networking////
-D/peripherals////
-D/pics////
-D/preferences////
-D/printers////
-D/reports////
-D/reservation////
-D/setup////
-D/software////
-D/stats////
-D/tracking////
-/siteroot.php/1.2/Mon Mar 7 08:57:33 2005//
-/styles.css/1.20/Mon Mar 7 08:57:33 2005//
+/siteroot.php/1.2/Fri Mar 4 19:05:37 2005//
+/styles.css/1.20/Sun Mar 6 17:21:25 2005//
/toolbar.js/1.3/Sun Mar 6 17:21:25 2005//
-/update.php/1.98/Mon Mar 7 08:57:34 2005//
+/update.php/1.99/Mon Mar 7 10:44:24 2005//
+/update_content.php/1.13/Mon Mar 7 10:44:24 2005//
+/update_lieux.php/1.5/Tue Feb 15 13:17:07 2005//
+D
diff -Nur web/glpi/glpi/CVS/Entries.Log glpi/CVS/Entries.Log
--- web/glpi/glpi/CVS/Entries.Log 2005-03-07 09:57:36.000000000 +0100
+++ glpi/CVS/Entries.Log 2005-03-07 14:03:07.000000000 +0100
@@ -1,2 +1,26 @@
-R D/ldap////
-R D/conffiles////
+A D/backups////
+A D/cartridges////
+A D/computers////
+A D/conffiles////
+A D/contacts////
+A D/contracts////
+A D/enterprises////
+A D/glpi////
+A D/help////
+A D/helpdesk////
+A D/infocoms////
+A D/knowbase////
+A D/ldap////
+A D/monitors////
+A D/mysql////
+A D/networking////
+A D/peripherals////
+A D/pics////
+A D/preferences////
+A D/printers////
+A D/reports////
+A D/reservation////
+A D/setup////
+A D/software////
+A D/stats////
+A D/tracking////
diff -Nur web/glpi/glpi/enterprises/CVS/Entries glpi/enterprises/CVS/Entries
--- web/glpi/glpi/enterprises/CVS/Entries 2005-03-04 09:45:51.000000000 +0100
+++ glpi/enterprises/CVS/Entries 2005-03-07 14:02:48.000000000 +0100
@@ -1,5 +1,5 @@
-/_relpos.php/1.1/Sat Feb 19 14:17:24 2005//
-/enterprises-info-form.php/1.3/Fri Feb 25 11:16:35 2005//
-/enterprises-search.php/1.2/Sat Feb 26 23:00:42 2005//
-/index.php/1.1/Sat Feb 19 14:17:24 2005//
+/_relpos.php/1.2/Mon Mar 7 10:44:24 2005//
+/enterprises-info-form.php/1.4/Mon Mar 7 10:44:24 2005//
+/enterprises-search.php/1.3/Mon Mar 7 10:44:24 2005//
+/index.php/1.2/Mon Mar 7 10:44:24 2005//
D
diff -Nur web/glpi/glpi/enterprises/enterprises-info-form.php glpi/enterprises/enterprises-info-form.php
--- web/glpi/glpi/enterprises/enterprises-info-form.php 2005-02-25 12:16:35.000000000 +0100
+++ glpi/enterprises/enterprises-info-form.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/enterprises/enterprises-search.php glpi/enterprises/enterprises-search.php
--- web/glpi/glpi/enterprises/enterprises-search.php 2005-02-27 00:00:42.000000000 +0100
+++ glpi/enterprises/enterprises-search.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/enterprises/index.php glpi/enterprises/index.php
--- web/glpi/glpi/enterprises/index.php 2005-02-19 15:17:24.000000000 +0100
+++ glpi/enterprises/index.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/enterprises/_relpos.php glpi/enterprises/_relpos.php
--- web/glpi/glpi/enterprises/_relpos.php 2005-02-19 15:17:24.000000000 +0100
+++ glpi/enterprises/_relpos.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/find_num.php glpi/find_num.php
--- web/glpi/glpi/find_num.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/find_num.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/cartridges/classes.php glpi/glpi/cartridges/classes.php
--- web/glpi/glpi/glpi/cartridges/classes.php 2005-02-20 15:21:34.000000000 +0100
+++ glpi/glpi/cartridges/classes.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/cartridges/CVS/Entries glpi/glpi/cartridges/CVS/Entries
--- web/glpi/glpi/glpi/cartridges/CVS/Entries 2005-03-04 09:45:51.000000000 +0100
+++ glpi/glpi/cartridges/CVS/Entries 2005-03-07 14:02:48.000000000 +0100
@@ -1,4 +1,4 @@
-/_relpos.php/1.1/Sun Feb 13 16:53:28 2005//
-/classes.php/1.8/Sun Feb 20 14:21:34 2005//
-/functions.php/1.19/Thu Mar 3 23:58:18 2005//
+/_relpos.php/1.2/Mon Mar 7 10:44:24 2005//
+/classes.php/1.9/Mon Mar 7 10:44:24 2005//
+/functions.php/1.20/Mon Mar 7 10:44:24 2005//
D
diff -Nur web/glpi/glpi/glpi/cartridges/functions.php glpi/glpi/cartridges/functions.php
--- web/glpi/glpi/glpi/cartridges/functions.php 2005-03-04 00:58:18.000000000 +0100
+++ glpi/glpi/cartridges/functions.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/cartridges/_relpos.php glpi/glpi/cartridges/_relpos.php
--- web/glpi/glpi/glpi/cartridges/_relpos.php 2005-02-13 17:53:28.000000000 +0100
+++ glpi/glpi/cartridges/_relpos.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/common/classes.php glpi/glpi/common/classes.php
--- web/glpi/glpi/glpi/common/classes.php 2005-03-04 00:58:18.000000000 +0100
+++ glpi/glpi/common/classes.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/common/CVS/Entries glpi/glpi/common/CVS/Entries
--- web/glpi/glpi/glpi/common/CVS/Entries 2005-03-07 09:57:34.000000000 +0100
+++ glpi/glpi/common/CVS/Entries 2005-03-07 14:02:49.000000000 +0100
@@ -1,4 +1,4 @@
-/_relpos.php/1.4/Sat Feb 12 16:00:10 2005//
-/classes.php/1.62/Thu Mar 3 23:58:18 2005//
-/functions.php/1.170/Result of merge//
+/_relpos.php/1.5/Mon Mar 7 10:44:24 2005//
+/classes.php/1.63/Mon Mar 7 10:44:24 2005//
+/functions.php/1.171/Mon Mar 7 10:44:24 2005//
D
diff -Nur web/glpi/glpi/glpi/common/functions.php glpi/glpi/common/functions.php
--- web/glpi/glpi/glpi/common/functions.php 2005-03-07 11:24:19.000000000 +0100
+++ glpi/glpi/common/functions.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
@@ -844,81 +845,9 @@
echo "</select>";
}
}
- /*!
- \brief remplie la dropdown avec la colonne d'une table passée en argument
-*/
-
-/*
-function dropdownValue($table,$myname,$value,$bur=0) {
-
- global $deleted_tables;
-
- // Make a select box with preselected values
- $db = new DB;
- if ($table == "glpi_dropdown_locations" || $table=="glpi_dropdown_kbcategories"){
- echo "<select name=\"$myname\">";
- echo "<option value=\"0\">-----</option>";
- showTreeListSelect($table,$value, 0,$bur);
- echo "</select>";
- }
- else if($table == "glpi_dropdown_netpoint") {
- $query = "select t1.ID as ID, t1.name as netpname, t2.ID as locID from glpi_dropdown_netpoint as t1";
- $query .= " left join glpi_dropdown_locations as t2 on t1.location = t2.ID";
- $query .= " order by t1.name,t2.name ";
- $result = $db->query($query);
- echo "<select name=\"$myname\">";
- $i = 0;
- $number = $db->numrows($result);
- if ($number > 0) {
- while ($i < $number) {
- $output = $db->result($result, $i, "netpname");
- $loc = getTreeValueName("glpi_dropdown_locations",$db->result($result, $i, "locID"));
- $ID = $db->result($result, $i, "ID");
- echo "<option value=\"$ID\"";
- if ($ID==$value) echo " selected ";
- echo ">$output ($loc)</option>";
- $i++;
- }
- }
- echo "</select>";
- }
-
- else {
- $where="";
- if (in_array($table,$deleted_tables))
- $where="WHERE deleted='N'";
- $query = "SELECT * FROM $table $where ORDER BY name";
- $result = $db->query($query);
-
- echo "<select name=\"$myname\" size='1'>";
- echo "<option value=\"0\">-----</option>";
- $i = 0;
- $number = $db->numrows($result);
- if ($number > 0) {
- while ($i < $number) {
- $output = $db->result($result, $i, "name");
- $ID = $db->result($result, $i, "ID");
- if ($ID === $value) {
- echo "<option value=\"$ID\" selected>$output</option>";
-
- } else {
- echo "<option value=\"$ID\">$output</option>";
- }
- $i++;
- }
- }
- echo "</select>";
-
- if ($table=="glpi_enterprises") {
- echo getEnterpriseLinks($value);
- }
-
- }
-}
-*/
-function dropdownValue($table,$myname,$value,$bur=0) {
+function dropdownValue($table,$myname,$value) {
global $deleted_tables;
@@ -927,7 +856,7 @@
if ($table == "glpi_dropdown_locations" || $table=="glpi_dropdown_kbcategories"){
echo "<select name=\"$myname\">";
echo "<option value=\"0\">-----</option>";
- showTreeListSelect($table,$value, 0,$bur);
+ showTreeListSelect($table,$value, 0);
echo "</select>";
}
else if($table == "glpi_dropdown_netpoint") {
@@ -950,50 +879,7 @@
}
}
echo "</select>";
- }
-
- //permet d'afficher une dropdown avec les différents responsables technique avec le responsable en //question sélectionné
- else if($table=="glpi_contacts")
- {
-
- $query="SELECT * FROM glpi_contacts ORDER BY name";
- $query2="SELECT * FROM glpi_computers";
- $result = $db->query($query);
- $result2=$db->query($query);
- echo "<select name=\"$myname\" size='1'>";
- $i = 0;
- $number = $db->numrows($result);
- $test=$db->result($result2,$i,"tech_num");
- if ($number > 0) {
- while ($i < $number) {
- $output = $db->result($result, $i, "name");//colonne de la table qui sera affichée dans la dropown
- $ID = $db->result($result, $i, "ID");
- $tech=$db->result($result, $i,"type");
- if($test == 0)
- {
- echo "<option value=\"NULL\">-----</option>";
- $test+=1;
- }
- if($tech == 2){
- if ($ID === $value ) {
- echo "<option value=\"$ID\" selected>$output</option>";
-
- } else {
-
- echo "<option value=\"$ID\" >$output</option>";
- }
- }
- $i++;
-
- }
-
- }
- echo "</select>";
- }
-
-
-
- else {
+ } else {
$where="";
if (in_array($table,$deleted_tables))
@@ -1027,6 +913,7 @@
}
}
+
function dropdownNoValue($table,$myname,$value) {
// Make a select box without parameters value
@@ -1100,49 +987,16 @@
function dropdownValueSearch($table,$myname,$value,$search) {
// Make a select box with preselected values
- if(is_string($search))
- {
+ global $deleted_tables;
$db = new DB;
- $query = "SELECT * FROM $table WHERE name LIKE '%$search%' ORDER BY name";
- $result = $db->query($query);
-
-
- $number = $db->numrows($result);
- if ($number == 0) {
- $query = "SELECT * FROM $table ORDER BY name";
- $result = $db->query($query);
- $number = $db->numrows($result);
- }
-
- echo "<select name=\"$myname\" size='1'>";
-
- if ($number > 0) {
- $i = 0;
- while ($i < $number) {
- if ($table=="glpi_software")
- $output = $db->result($result, $i, "name")." ".$db->result($result, $i, "version");
- else
- $output = $db->result($result, $i, "name");
- $ID = $db->result($result, $i, "ID");
-
- if ($ID == $value) {
- echo "<option value=\"$ID\" selected>$output</option>";
- } else {
- echo "<option value=\"$ID\">$output</option>";
- }
- $i++;
- }
- }
- echo "</select>";
- }
- else
- {
- $db = new DB;
+ $where="";
+ if (in_array($table,$deleted_tables))
+ $where="AND deleted='N'";
- $query = "SELECT * FROM $table WHERE Parentid LIKE '$search' ORDER BY name";
+ $query = "SELECT * FROM $table WHERE name LIKE '%$search%' $where ORDER BY name";
$result = $db->query($query);
-
+
$number = $db->numrows($result);
if ($number == 0) {
@@ -1171,7 +1025,6 @@
}
}
echo "</select>";
- }
}
function dropdownUsers($value, $myname) {
@@ -1918,164 +1771,6 @@
echo "</table><br><hr><br>";
break;
- //rapport reseau par etage
- case 'glpi_networking_etage' :
- echo "<table width='100%' height='60' border='0'>";
- echo "<tr> ";
- //echo "<th><div align='center'><b>".$lang["reports"][34]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][35]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][37]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][41]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][46]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][47]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][36]."</b></div></th>";
- echo "</tr>";
-
- while( $ligne = $db->fetch_array($result))
- {
- //echo $ligne['location'];
- //print_r($ligne);
- $bureau = $ligne['bureau'];
- //$etage=$ligne['etage'];
- $prise=$ligne['prise'];
- $port=$ligne['port'];
- $switch=$ligne['switch'];
- $portordi=$ligne['portordi'];
- $ordi=$ligne['ordi'];
- //inserer ces valeures dans un tableau
-
- echo "<tr>";
- //if($etage) echo "<td><div align='center'>$etage</div></td>"; else echo //"<td><div align='center'> N/A </div></td>";
- if($bureau) echo "<td><div align='center'>$bureau</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($prise) echo "<td><div align='center'>$prise</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($switch) echo "<td><div align='center'>$switch</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($port) echo "<td><div align='center'>$port</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($portordi) echo "<td><div align='center'>$portordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($ordi) echo "<td><div align='center'>$ordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- }
- echo "</table><br><hr><br>";
- break;
-
- //rapport reseau par bureau
- case 'glpi_networking_bureau' :
- echo "<table width='100%' height='60' border='0'>";
- echo "<tr> ";
- //echo "<th><div align='center'><b>".$lang["reports"][34]."</b></div></th>";
- //echo "<th><div align='center'><b>".$lang["reports"][35]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][37]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][41]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][46]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][47]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][36]."</b></div></th>";
- echo "</tr>";
-
- while( $ligne = $db->fetch_array($result))
- {
- //echo $ligne['location'];
- //print_r($ligne);
- //$bureau = $ligne['bureau'];
- //$etage=$ligne['etage'];
- $prise=$ligne['prise'];
- $port=$ligne['port'];
- $switch=$ligne['switch'];
- $portordi=$ligne['portordi'];
- $ordi=$ligne['ordi'];
- //inserer ces valeures dans un tableau
-
- echo "<tr>";
- /*if($etage) echo "<td><div align='center'>$etage</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($bureau) echo "<td><div align='center'>$bureau</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- */
- if($prise) echo "<td><div align='center'>$prise</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($switch) echo "<td><div align='center'>$switch</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($port) echo "<td><div align='center'>$port</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($portordi) echo "<td><div align='center'>$portordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($ordi) echo "<td><div align='center'>$ordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- }
- echo "</table><br><hr><br>";
- break;
-
- //rapport reseau par switch
- case 'glpi_networking_switch' :
- echo "<table width='100%' height='60' border='0'>";
- echo "<tr> ";
- //echo "<th><div align='center'><b>".$lang["reports"][42]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][35]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][39]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][37]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][46]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][47]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][36]."</b></div></th>";
- echo "</tr>";
-
- while( $ligne = $db->fetch_array($result))
- {
- //$switch = $ligne['switch'];
- //echo $ligne['location'];
- //print_r($ligne);
- $bureau=$ligne['bureau'];
- $etage=$ligne['etage'];
- $prise=$ligne['prise'];
- $port = $ligne['port'];
- $portordi=$ligne['portordi'];
- $ordi=$ligne['ordi'];
-
- //inserer ces valeures dans un tableau
-
- echo "<tr>";
- //if($switch) echo "<td><div align='center'>$switch</div></td>"; else echo //"<td><div align='center'> N/A </div></td>";
- if($bureau) echo "<td><div align='center'>$bureau</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($etage) echo "<td><div align='center'>$etage</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($prise) echo "<td><div align='center'>$prise</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($port) echo "<td><div align='center'>$port</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($portordi) echo "<td><div align='center'>$portordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($ordi) echo "<td><div align='center'>$ordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- }
- echo "</table><br><hr><br>";
- break;
-
- //rapport reseau par prise
- case 'glpi_networking_prise' :
- echo "<table width='100%' height='60' border='0'>";
- echo "<tr> ";
- //echo "<th><div align='center'><b>".$lang["reports"][44]."</b></div></th>";
- //echo "<th><div align='center'><b>".$lang["reports"][39]."</b></div></th>";
- //echo "<th><div align='center'><b>".$lang["reports"][43]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][42]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][46]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][47]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][36]."</b></div></th>";
- echo "</tr>";
-
- while( $ligne = $db->fetch_array($result))
- {
- $prise=$ligne['prise'];
- $bureau = $ligne['bureau'];
- $etage=$ligne['etage'];
- $switch=$ligne['switch'];
- $port=$ligne['port'];
- $portordi=$ligne['portordi'];
- $ordi=$ligne['ordi'];
- //echo $ligne['location'];
- //print_r($ligne);
- //$ports=$ligne['ports'];
- //$ifaddr = $ligne['ifaddr'];
-
-
- //inserer ces valeures dans un tableau
-
- echo "<tr>";
- //if($prise) echo "<td><div align='center'>$prise</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- //if($etage) echo "<td><div align='center'>$etage</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- //if($bureau) echo "<td><div align='center'>$bureau</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($switch) echo "<td><div align='center'>$switch</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($port) echo "<td><div align='center'>$port</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($portordi) echo "<td><div align='center'>$portordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($ordi) echo "<td><div align='center'>$ordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- }
- echo "</table><br><hr><br>";
- break;
-
}
}
@@ -2226,77 +1921,33 @@
return $string;
}
-function showTreeListSelect($table,$current, $parentID=0,$bur=0, $categoryname="")
+function showTreeListSelect($table,$current, $parentID=0, $categoryname="")
{
- /*
- arguments de showTreeListSelect
- - table:la table dans laquelle on execute la reqête
- - current
- - parentID
- - bur: si il vaut 0 on affiche seulement les étages, sinon on affiche les bureaux
- */
-
$query = "select * from $table where (parentID = $parentID) order by name ";
-
-
$db=new DB;
- //renvoie les etages et les bureaux
- if($bur==0){
+
if ($result=$db->query($query)){
if ($db->numrows($result)>0){
-
-
- while ($row=$db->fetch_array($result)){
-
- $ID = $row["ID"];
- $name = $categoryname . $row["name"];
- echo "<option value='$ID'";
- if($current == $ID)
- {
- echo " selected";
- }
- echo ">$name</option>\n";
- $name = $name . "\\";
- $bur=1;
- showTreeListSelect($table,$current, $ID,$bur,$name);
- }
- } }
- }
-
- //renvoie seulement les bureaux
- else{
- if ($result=$db->query($query)){
- if ($db->numrows($result)>0){
-
-
+
while ($row=$db->fetch_array($result)){
- //print_r($row);
$ID = $row["ID"];
$name = $categoryname . $row["name"];
- if(strchr($name,"\\"))
- {
echo "<option value='$ID'";
-
if($current == $ID)
{
echo " selected";
-
}
echo ">$name</option>\n";
- }
$name = $name . "\\";
-
- showTreeListSelect($table,$current, $ID,$bur,$name);
-
-
+ showTreeListSelect($table,$current, $ID, $name);
}
} }
-}
-}
+}
+
function getTreeLeafValueName($table,$ID)
{
$query = "select * from $table where (ID = $ID)";
diff -Nur web/glpi/glpi/glpi/common/functions.php~ glpi/glpi/common/functions.php~
--- web/glpi/glpi/glpi/common/functions.php~ 2005-03-07 09:57:34.000000000 +0100
+++ glpi/glpi/common/functions.php~ 1970-01-01 01:00:00.000000000 +0100
@@ -1,2356 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
-*/
-
-// Based on:
-// IRMA, Information Resource-Management and Administration
-// Christian Bauer
-// ----------------------------------------------------------------------
-// Original Author of file:
-// Purpose of file:
-// ----------------------------------------------------------------------
-
-function can_assign_job($name)
-{
- $db = new DB;
- $query = "SELECT * FROM glpi_users WHERE (name = '".$name."')";
- $result = $db->query($query);
- if (!$result&&$db->numrows()==0) return false;
- $type = $db->result($result, 0, "can_assign_job");
- if ($type == 'yes')
- {
- return true;
- }
- else
- {
- return false;
- }
-}
-
-function isPostOnly($authtype) {
- switch ($authtype){
- case "post-only" :
- case "normal" :
- case "admin":
- case "super-admin":
- return true;
- break;
- default :
- return false;
- }
-}
-
-function isNormal($authtype) {
- switch ($authtype){
- case "normal" :
- case "admin":
- case "super-admin":
- return true;
- break;
- default :
- return false;
- }
-}
-
-
-function isAdmin($authtype) {
- switch ($authtype){
- case "admin":
- case "super-admin":
- return true;
- break;
- default :
- return false;
- }
-}
-
-function isSuperAdmin($authtype) {
- switch ($authtype){
- case "super-admin":
- return true;
- break;
- default :
- return false;
- }
-}
-function searchUserbyType($authtype) {
- switch ($authtype){
- case "post-only" :
- return " 1=1 ";
- break;
- case "normal" :
- return " type ='super-admin' || type ='admin' || type ='normal'";
- break;
- case "admin":
- return " type ='super-admin' || type ='admin' ";
- break;
- case "super-admin":
- return " type ='super-admin' ";
- break;
- default :
- return "";
- }
-}
-
-function getDictEntryfromDB($s){
-GLOBAL $lang;
-$a=split("_",$s);
-return $lang[$a[0]][$a[1]];
-}
-
- function stripslashes_deep($value)
- {
-//echo "strip";
- $value = is_array($value) ?
- array_map('stripslashes_deep', $value) :
- (is_null($value) ? NULL : stripslashes($value));
-
- return $value;
- }
- function addslashes_deep($value)
- {
-//echo "add";
- $value = is_array($value) ?
- array_map('addslashes_deep', $value) :
- (is_null($value) ? NULL : addslashes($value));
- return $value;
- }
-
- function htmlentities_deep($value)
- {
-//echo "add";
- $value = is_array($value) ?
- array_map('htmlentities_deep', $value) :
- (is_null($value) ? NULL : htmlentities($value,ENT_QUOTES));
- return $value;
- }
- // Nécessaire pour PHP < 4.3
- function unhtmlentities ($string)
- {
- $trans_tbl = get_html_translation_table (HTML_ENTITIES,ENT_QUOTES);
- if( $trans_tbl["'"] != ''' ) { # some versions of PHP match single quotes to '
- $trans_tbl["'"] = ''';
- }
- $trans_tbl = array_flip ($trans_tbl);
- return strtr ($string, $trans_tbl);
- }
- function unhtmlentities_deep($value)
- {
- $value = is_array($value) ?
- array_map('unhtmlentities_deep', $value) :
- (is_null($value) ? NULL : unhtmlentities($value,ENT_QUOTES));
- return $value;
- }
-
-function checkAuthentication($authtype) {
- // Universal method to have a magic-quote-gpc system
- global $_POST, $_GET,$_COOKIE,$tab;
- // Clean array and addslashes
-
-if (get_magic_quotes_gpc()) {
- if (isset($_POST)){
- $_POST = array_map('stripslashes_deep', $_POST);
- }
- if (isset($_GET)){
- $_GET = array_map('stripslashes_deep', $_GET);
- }
-/* if (isset($_COOKIE)){
- $_COOKIE = array_map('stripslashes_deep', $_COOKIE);
- $_COOKIE = array_map('addslashes_deep', $_COOKIE);
- }
-*/ if (isset($tab)){
- $tab = array_map('stripslashes_deep', $tab);
- }
-}
-
- if (isset($_POST)){
- $_POST = array_map('addslashes_deep', $_POST);
- }
- if (isset($_GET)){
- $_GET = array_map('addslashes_deep', $_GET);
- }
-/* if (isset($_COOKIE)){
- $_COOKIE = array_map('addslashes_deep', $_COOKIE);
- }
-*/ if (isset($tab)){
- $tab = array_map('addslashes_deep', $tab);
- }
-
- // Checks a GLOBAL user and password against the database
- // If $authtype is "normal" or "admin", it checks if the user
- // has the privileges to do something. Should be used in every
- // control-page to set a minium security level.
- if(!isset($_SESSION)) session_start();
-
- GLOBAL $cfg_install, $lang, $HTMLRel;
-
- if(empty($_SESSION["authorisation"]))
- {
- nullHeader("Login",$_SERVER["PHP_SELF"]);
- echo "<div align='center'><b><a href=\"".$cfg_install["root"]."/logout.php\">Relogin</a></b></div>";
- nullFooter();
- die();
- }
-
-
- // New database object
-// print_r($_SESSION);
- loadLanguage();
- $type = $_SESSION["glpitype"];
-
- // Check username and password
- if (!isset($_SESSION["glpiname"])) {
- header("Vary: User-Agent");
- nullHeader($lang["login"][3], $_SERVER["PHP_SELF"]);
- echo "<center><b>".$lang["login"][0]."</b><br><br>";
- echo "<b><a href=\"".$cfg_install["root"]."/logout.php\">".$lang["login"][1]."</a></b></center>";
- nullFooter();
- exit();
- } else {
- header("Vary: User-Agent");
-
- loadLanguage();
-
- switch ($authtype) {
- case "super-admin";
- if (!isSuperAdmin($type))
- {
- commonHeader($lang["login"][5],$_SERVER["PHP_SELF"]);
- echo "<center><br><br><img src=\"".$HTMLRel."pics/warning.png\" alt=\"warning\"><br><br>";
- echo "<b>".$lang["login"][5]."</b></center>";
- commonFooter();
- exit();
- }
- break;
-
- case "admin";
- if (!isAdmin($type))
- {
- commonHeader($lang["login"][5],$_SERVER["PHP_SELF"]);
- echo "<center><br><br><img src=\"".$HTMLRel."pics/warning.png\" alt=\"warning\"><br><br>";
-
- echo "<b>".$lang["login"][5]."</b></center>";
- commonFooter();
- exit();
- }
- break;
-
- case "normal";
- if (!isNormal($type))
- {
- commonHeader($lang["login"][5],$_SERVER["PHP_SELF"]);
- echo "<center><br><br><img src=\"".$HTMLRel."pics/warning.png\" alt=\"warning\"><br><br>";
-
- echo "<b>".$lang["login"][5]."</b></center>";
- commonFooter();
- exit();
- }
- break;
-
- case "post-only";
- if (!isPostOnly($type))
- {
- commonHeader($lang["login"][5],$_SERVER["PHP_SELF"]);
- echo "<center><br><br><img src=\"".$HTMLRel."pics/warning.png\" alt=\"warning\"><br><br>";
-
- echo "<b>".$lang["login"][5]."</b></center>";
- commonFooter();
- exit();
- }
- break;
- }
- }
-}
-
-function commonHeader($title,$url)
-{
- // Print a nice HTML-head for every page
-
- GLOBAL $cfg_install,$lang, $cfg_layout,$cfg_features,$HTMLRel,$phproot ;
-
-
-$utils = array($lang["Menu"][17]=>array("/reservation/index.php","1"),
- $lang["Menu"][19]=>array("/knowbase/index.php"," "),
- $lang["Menu"][6]=>array("/reports/index.php"," "),
- );
-
-$inventory = array($lang["Menu"][0]=>array("/computers/index.php","1"),
- $lang["Menu"][1]=>array("/networking/index.php","2"),
- $lang["Menu"][2]=>array("/printers/index.php","3"),
- $lang["Menu"][3]=>array("/monitors/index.php","4"),
- $lang["Menu"][4]=>array("/software/index.php","5"),
- $lang["Menu"][16]=>array("/peripherals/index.php","6"),
- $lang["Menu"][21]=>array("/cartridges/index.php","7"),
- " "=>array("/central.php","8"),
- );
-
-$financial = array($lang["Menu"][22]=>array("/contacts/index.php","1"),
- $lang["Menu"][23]=>array("/enterprises/index.php"," "),
- $lang["Menu"][25]=>array("/contracts/index.php"," "),
- );
-
-$maintain = array($lang["Menu"][5]=>array("/tracking/index.php","6"),
- "Helpdesk"=>array("/helpdesk/index.php"," "),
- $lang["Menu"][13]=>array("/stats/index.php"," "));
-
-
-$config = array($lang["Menu"][14]=>array("/setup/setup-users.php"," "),
- $lang["Menu"][10]=>array("/setup/index.php"," "),
- $lang["Menu"][11]=>array("/preferences/index.php"," "),
- $lang["Menu"][12]=>array("/backups/index.php"," "));
-
- // Send extra expires header if configured
- if ($cfg_features["sendexpire"]) {
- header("Expires: Fri, Jun 12 1981 08:20:00 GMT\nPragma: no-cache");
- }
-
- // Start the page
- echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\";>";
- echo "<html><head><title>GLPI - ".$title."</title>";
- echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1 \" >";
-
- // Send extra expires header if configured
- if ($cfg_features["sendexpire"]) {
- echo "<meta http-equiv=\"Expires\" content=\"Fri, Jun 12 1981 08:20:00 GMT\">\n";
- echo "<meta http-equiv=\"Pragma\" content=\"no-cache\">\n";
- echo "<meta http-equiv=\"Cache-Control\" content=\"no-cache\">\n";
- }
-
- // Appel CSS
-
- echo "<link rel='stylesheet' href='".$HTMLRel."styles.css' type='text/css' media='screen' >";
- echo "<link rel='stylesheet' type='text/css' media='print' href='".$HTMLRel."print.css' >";
- echo "<link rel='shortcut icon' type='images/x-icon' href='".$HTMLRel."pics/favicon.ico' >";
-
- // Some Javascript-Functions which we may need later
-
- echo "<script type=\"text/javascript\" src='".$HTMLRel."script.js'></script>";
-
-
-
-
-
- // End of Head
- echo "</head>\n";
-
- // Body with configured stuff
- echo "<body>";
-
- // Main Headline
- echo "<div id='navigation'>";
- echo "<table cellspacing='0' border='0' width='100%'>";
- echo "<tr>";
-
- // New object from the configured base functions, we check some
- // object-variables in this object: inventory, maintain, admin
- // and settings. We build the navigation bar here.
-
- $navigation = new baseFunctions;
-
-
- // Logo with link to command center
- echo "<td width='80px' valign='middle' align='center' >\n";
- echo "<a class='icon_logo' href=\"".$cfg_install["root"]."/central.php\" accesskey=\"0\"><img src=\"".$HTMLRel."pics/logo-glpi.png\" alt=\"".$cfg_layout["logotxt"]."\" title=\"".$lang["central"][5]."\"></a>";
- echo "<br><br><div style='width:80px; text-align:center;'><p class='nav_horl'><b>".$_SESSION["glpiname"]."</b></p></div>";
- echo "</td>";
-
- echo "<td valign='middle' style='padding-left:20px'>";
-
-
- // Get object-variables and build the navigation-elements
- echo "<table width='100%' cellspacing='0' cellpadding='0' border='0'><tr>";
-
-
- if ($navigation->inventory) {
- echo "<td align='center' valign='top' width='20%'>";
- echo "<img class='icon_nav' src=\"".$HTMLRel."pics/inventaire.png\" alt=\"\" title=\"".$lang["setup"][10]."\"><br>";
- echo "<span class='menu_title'>- ".$lang["setup"][10]." -</span><br>";
-
- echo "<table cellspacing='0' border='0' cellpadding='0'><tr><td>";
- $i=0;
- foreach ($inventory as $key => $val) {
- if ($i%2==1) echo "</td><td style='border-left:1px groove #000000; border-right:1px groove #000000'> </td><td style='padding-left:5px; padding-right:5px;' align='center'>";
- else echo "</td></tr><tr><td style='padding-left:5px; padding-right:5px;' align='center'>";
-
- echo "<span class='menu'><a href=\"".$cfg_install["root"].$val[0]."\" accesskey=\"".$val[1]."\">".$key."</a></span><br>";
- $i++;
- }
- echo "</td></tr></table>";
- echo "</td>";
- }
-
-
- if ($navigation->maintain) {
- echo "<td align='center' valign='top' width='20%'>";
- echo "<img class='icon_nav' src=\"".$HTMLRel."pics/maintenance.png\" alt=\"\" title=\"".$lang["title"][24]."\"><br>";
-
- echo "<span class='menu_title'>- ".$lang["title"][24]." -</span><br>";
- foreach ($maintain as $key => $val) {
- echo "<span class='menu'><a href=\"".$cfg_install["root"].$val[0]."\" accesskey=\"".$val[1]."\">".$key."</a></span><br>";
- }
- echo "</td>";
- }
-
- if ($navigation->financial) {
- echo "<td align='center' valign='top' width='20%'>";
- echo "<img class='icon_nav' src=\"".$HTMLRel."pics/gestion.png\" alt=\"\" title=\"".$lang["setup"][55]."\"><br>";
-
- echo "<span class='menu_title'>- ".$lang["Menu"][26]." -</span><br>";
- foreach ($financial as $key => $val) {
- echo "<span class='menu'><a href=\"".$cfg_install["root"].$val[0]."\" accesskey=\"".$val[1]."\">".$key."</a></span><br>";
- }
- echo "</td>";
- }
-
-
- if ($navigation->utils) {
- echo "<td align='center' valign='top' width='20%'>";
- echo "<img class='icon_nav' src=\"".$HTMLRel."pics/outils.png\" alt=\"\" title=\"".$lang["Menu"][15]."\"><br>";
-
- echo "<span class='menu_title'>- ".$lang["Menu"][18]." -</span><br>";
- foreach ($utils as $key => $val) {
- echo "<span class='menu'><a href=\"".$cfg_install["root"].$val[0]."\" accesskey=\"".$val[1]."\">".$key."</a></span><br>";
- }
- }
-
-
- if ($navigation->settings) {
- echo "<td align='center' valign='top' width='20%'>";
- echo "<img class='icon_nav' src=\"".$HTMLRel."pics/config.png\" alt=\"\" title=\"".$lang["Menu"][15]."\"><br>";
-
- echo "<span class='menu_title'>- ".$lang["Menu"][15]." -</span><br>";
- foreach ($config as $key => $val) {
- echo "<span class='menu'><a href=\"".$cfg_install["root"].$val[0]."\" accesskey=\"".$val[1]."\">".$key."</a></span><br>";
- }
- echo "</td>";
- }
-
-
-
-
- // On the right side of the navigation bar, we have a clock with
- // date, help and a logout-link.
-
- echo "<td align='center' valign='top' width='100px'>";
- //help
- echo "<a class='icon_nav_move' href='#' onClick=\"window.open('".$HTMLRel."help/".$cfg_install["languages"][$_SESSION["glpilanguage"]][2]."','helpdesk','width=700,height=600,scrollbars=yes')\"><img class='icon_nav' src=\"".$HTMLRel."pics/help.png\" alt=\"\" title=\"".$lang["central"][7]."\"></a>";
- echo "<p>".date("H").":".date("i")."<br><i>".date("j.")." ".date("M")." ".date("Y");
- echo "</i></p>";
- echo "<a class='icon_nav_move' href=\"".$cfg_install["root"]."/logout.php\"><img src=\"".$HTMLRel."pics/logout.png\" alt=\"".$lang["central"][6]."\" title=\"".$lang["central"][6]."\"></a>";
-
- echo "</td>";
-
- // End navigation bar
-
- echo "</tr></table>";
-
- // End headline
-
-
- echo "</td></tr>";
-echo "</table>\n";
- echo "</div>";
-// Affichage du message apres redirection
-if (isset($_SESSION["MESSAGE_AFTER_REDIRECT"])&&!empty($_SESSION["MESSAGE_AFTER_REDIRECT"])){
-echo "<center><b>".$_SESSION["MESSAGE_AFTER_REDIRECT"]."</b></center>";
-unset($_SESSION["MESSAGE_AFTER_REDIRECT"]);
-}
-}
-
-
-function helpHeader($title,$url,$name) {
- // Print a nice HTML-head for help page
-
- GLOBAL $cfg_layout,$cfg_install,$lang,$cfg_features,$HTMLRel,$phproot ;
-
- // Send extra expires header if configured
- if ($cfg_features["sendexpire"]) {
- header("Expires: Fri, Jun 12 1981 08:20:00 GMT\nPragma: no-cache");
- }
-
- // Start the page
- echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\";>";
- echo "<html><head><title>GLPI Helpdesk - ".$title."</title>";
- echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1 \" >";
- echo "<link rel='shortcut icon' type='images/x-icon' href='".$HTMLRel."pics/favicon.ico' />";
- // Send extra expires header if configured
- if ($cfg_features["sendexpire"]) {
- echo "<meta http-equiv=\"Expires\" content=\"Fri, Jun 12 1981 08:20:00 GMT\">\n";
- echo "<meta http-equiv=\"Pragma\" content=\"no-cache\">\n";
- echo "<meta http-equiv=\"Cache-Control\" content=\"no-cache\">\n";
- }
-
- // Some Javascript-Functions which we may need later
-
- echo "<script type=\"text/javascript\" src='".$HTMLRel."script.js'></script>";
-
- // Appel CSS
-
- echo "<link rel='stylesheet' href='".$HTMLRel."styles.css' type='text/css' media='screen' >";
- echo "<link rel='stylesheet' type='text/css' media='print' href='".$HTMLRel."print.css' >";
-
- // End of Head
- echo "</head>\n";
-
- // Body with configured stuff
- echo "<body>";
-
- // Main Headline
- echo "<div id='navigation'>";
-
- echo "<table cellspacing='0' border='0' width='98%'>";
- echo "<tr>";
-
- // Logo with link to command center
- echo "<td align='center' width='25%'>\n";
-
- echo "<img src=\"".$HTMLRel."pics/logo-glpi.png\" alt=\"".$cfg_layout["logotxt"]."\" title=\"".$lang["central"][5]."\" >";
- echo "<div style='width:80px; text-align:center;'><p class='nav_horl'><b>".$_SESSION["glpiname"]."</b></p></div>";
- echo "</td>";
-
- echo "<td valign='middle'>";
-
- echo "<table width='100%' cellspacing='0' cellpadding='0' border='0'><tr>";
-
- if (ereg("tracking-injector",$_SERVER["PHP_SELF"]))
- echo "<td width='100%'> </td>";
- // Just give him a language selector
- echo "<td>";
- if (!ereg("tracking-injector",$_SERVER["PHP_SELF"]))
- showLangSelect($cfg_install["root"]."/preferences/index.php",$name);
- else echo " ";
- echo "</td>";
-
- // And he can change his password, thats it
- echo "<td>";
- if ($_SESSION["extauth"]!=1&&!ereg("tracking-injector",$_SERVER["PHP_SELF"]))
- showPasswordForm($cfg_install["root"]."/preferences/index.php",$name);
- else echo " ";
- echo "</td>";
- // We tracking or post a new one
- echo "<td>";
- echo "<a class='icon_nav_move' href=\"".$cfg_install["root"]."/helpdesk.php\"><img src=\"".$HTMLRel."pics/ajoutinterv.png\" alt=\"".$lang["job"][13]."\" title=\"".$lang["job"][13]."\"></a><br><br>";
- echo "<a class='icon_nav_move' href=\"".$cfg_install["root"]."/helpdesk.php?show=user\"><img src=\"".$HTMLRel."pics/suivi.png\" alt=\"".$lang["tracking"][0]."\" title=\"".$lang["tracking"][0]."\"></a>";
- echo "</td>";
- //reservation
-
- echo "<td>";
- echo "<a class='icon_nav_move' href=\"".$cfg_install["root"]."/helpdesk.php?show=resa\"><img src=\"".$HTMLRel."pics/reservation-2.png\" alt=\"".$lang["Menu"][17]."\" title=\"".$lang["Menu"][17]."\"></a><br><br>";
- echo "<a class='icon_nav_move' href=\"".$cfg_install["root"]."/helpdesk.php?show=faq\"><img src=\"".$HTMLRel."pics/faq-24.png\" alt=\"".$lang["knowbase"][1]."\" title=\"".$lang["knowbase"][1]."\"></a>";
-
- echo "</td>";
- // On the right side of the navigation bar, we have a clock with
- // date, help and a logout-link.
- echo "<td align='right' width='100'><div align='right'>";
- // HELP
- echo "<a class='icon_nav_move' href='#' onClick=\"window.open('".$HTMLRel."help/".$cfg_install["languages"][$_SESSION["glpilanguage"]][1]."','helpdesk','width=400,height=600,scrollbars=yes')\"><img class='icon_nav' src=\"".$HTMLRel."pics/help.png\" alt=\"\" title=\"".$lang["central"][7]."\"></a><br><br>";
-
- echo date("H").":".date("i")."<p><i>".date("j.")." ".date("M")." ".date("Y");
- echo "</i></p><a class='icon_nav_move' href=\"".$cfg_install["root"]."/logout.php\"><img class='icon_nav' src=\"".$HTMLRel."pics/logout.png\" alt=\"".$lang["central"][6]."\" title=\"".$lang["central"][6]."\"></a></div></td>";
-
- // End navigation bar
-
- echo "</tr></table>";
-
- // End headline
-
- echo "</td></tr>";
- echo "</table>\n";
- echo "</div>";
-}
-
-function nullHeader($title,$url) {
- // Print a nice HTML-head with no controls
-
- GLOBAL $cfg_layout,$cfg_install,$lang,$HTMLRel,$phproot ;
-
- // Send extra expires header if configured
- if (!empty($cfg_features["sendexpire"])) {
- header("Expires: Fri, Jun 12 1981 08:20:00 GMT\nPragma: no-cache");
- }
-
- // Start the page
- echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\";>";
- echo "<html><head><title>GLPI - ".$title."</title>";
- echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1 \" >";
- echo "<link rel='shortcut icon' type='images/x-icon' href='".$HTMLRel."pics/favicon.ico' />";
- // Send extra expires header if configured
- if (!empty($cft_features["sendexpire"])) {
- echo "<meta http-equiv=\"Expires\" content=\"Fri, Jun 12 1981 08:20:00 GMT\">\n";
- echo "<meta http-equiv=\"Pragma\" content=\"no-cache\">\n";
- echo "<meta http-equiv=\"Cache-Control\" content=\"no-cache\">\n";
- }
-
- // Some Javascript-Functions which we may need later
-
- echo "<script type=\"text/javascript\" src='".$HTMLRel."script.js'></script>";
-
- // Appel CSS
-
- echo "<link rel='stylesheet' href='".$HTMLRel."styles.css' type='text/css' media='screen' >";
-
-
- // End of Head
- echo "</head>\n";
-
- // Body with configured stuff
- echo "<body>";
-
- // Main Headline
- echo "<div id='navigation'>";
-
- echo "<table cellspacing='0' border='0' width='98%'>";
- echo "<tr>";
-
- // Logo with link to index
- echo "<td align='center' width='100%'>\n";
- echo "<a href=\"".$cfg_install["root"]."/index.php\"><img src=\"".$HTMLRel."pics/logo-glpi.png\" alt=\"".$cfg_layout["logotxt"]."\" title=\"\" ></a>\n";
- echo "</td>";
-
-
- // End navigation bar
-
- echo "</tr></table>";
-
- // End headline
-
- echo "</td></tr></form>";
- echo "</table>\n";
- echo "</div>";
-}
-
-
-function commonFooter() {
- // Print foot for every page
-
-GLOBAL $cfg_install;
-echo "<div id='footer'><div align='right'>";
- echo "<a href=\"http://GLPI.indepnet.org/\";>";
- echo "<span class='copyright'>GLPI ".$cfg_install["version"]." Copyright (C) 2003-2005 by the INDEPNET Development Team.</span>";
- echo "</a></div>";
- echo "</div>";
- echo "</body></html>";
-}
-
-function helpFooter() {
- // Print foot for help page
-GLOBAL $cfg_install;
-echo "<div id='footer'><div align='right'>";
- echo "<a href=\"http://GLPI.indepnet.org/\";>";
- echo "<span class='copyright'>GLPI ".$cfg_install["version"]." Copyright (C) 2003-2005 by the INDEPNET Development Team.</span>";
- echo "</a></div>";
- echo "</div>";
-
- echo "</body></html>";
-}
-
-function nullFooter() {
- // Print foot for help page
-GLOBAL $cfg_install;
-echo "<div id='footer'><div align='right'>";
- echo "<a href=\"http://GLPI.indepnet.org/\";>";
- echo "<span class='copyright'>GLPI ".$cfg_install["version"]." Copyright (C) 2003-2005 by the INDEPNET Development Team.</span>";
- echo "</a>";
- echo "</div></div>";
-
- echo "</body></html>";
-}
-
-function logEvent ($item, $itemtype, $level, $service, $event) {
- // Logs the event if level is above or equal to setting from configuration
-
- GLOBAL $cfg_features;
- if ($level <= $cfg_features["event_loglevel"]) {
- $db = new DB;
- $query = "INSERT INTO glpi_event_log VALUES (NULL, $item, '$itemtype', NOW(), '$service', $level, '$event')";
- $result = $db->query($query);
- }
-}
-
-
-function showEvents($target,$order,$sort) {
- // Show events from $result in table form
-
- GLOBAL $cfg_layout, $cfg_install, $cfg_features, $lang, $HTMLRel;
-
- // new database object
- $db = new DB;
-
- // define default sorting
-
- if (!$sort) {
- $sort = "date";
- $order = "DESC";
- }
-
- // Query Database
- $query = "SELECT * FROM glpi_event_log ORDER BY $sort $order LIMIT 0,".$cfg_features["num_of_events"];
-
- // Get results
- $result = $db->query($query);
-
-
- // Number of results
- $number = $db->numrows($result);
-
- // No Events in database
- if ($number < 1) {
- echo "<b>".$lang["central"][4]."</b>";
- return;
- }
-
- // Output events
- $i = 0;
-
- echo "<p><center><table width='90%' class='tab_cadre'>";
- echo "<tr><th colspan='6'>".$lang["central"][2]." ".$cfg_features["num_of_events"]." ".$lang["central"][3].":</th></tr>";
- echo "<tr>";
-
- echo "<th colspan='2'>";
- if ($sort=="item") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?sort=item&order=ASC\">".$lang["event"][0]."</a></th>";
-
- echo "<th>";
- if ($sort=="date") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?sort=date&order=DESC\">".$lang["event"][1]."</a></th>";
-
- echo "<th width='8%'>";
- if ($sort=="service") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?sort=service&order=ASC\">".$lang["event"][2]."</a></th>";
-
- echo "<th width='8%'>";
- if ($sort=="level") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?sort=level&order=DESC\">".$lang["event"][3]."</a></th>";
-
- echo "<th width='60%'>";
- if ($sort=="message") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?sort=message&order=ASC\">".$lang["event"][4]."</a></th></tr>";
-
- while ($i < $number) {
- $ID = $db->result($result, $i, "ID");
- $item = $db->result($result, $i, "item");
- $itemtype = $db->result($result, $i, "itemtype");
- $date = $db->result($result, $i, "date");
- $service = $db->result($result, $i, "service");
- $level = $db->result($result, $i, "level");
- $message = $db->result($result, $i, "message");
-
- echo "<tr class='tab_bg_2'>";
- echo "<td>$itemtype:</td><td align='center'><b>";
- if ($item=="-1" || $item=="0") {
- echo $item;
- } else {
- if ($itemtype=="reservation"){
- echo "<a href=\"".$cfg_install["root"]."/$itemtype/index.php?show=resa&ID=";
- } else {
- echo "<a href=\"".$cfg_install["root"]."/$itemtype/".$itemtype."-info-form.php?ID=";
- }
- echo $item;
- echo "\">$item</a>";
- }
- echo "</b></td><td>$date</td><td align='center'>$service</td><td align='center'>$level</td><td>$message</td>";
- echo "</tr>";
-
- $i++;
- }
-
- echo "</table></center><br>";
-}
-
-
-
-function dropdown($table,$myname) {
-
- global $deleted_tables;
-
- // Make a select box
- $db = new DB;
- if($table == "glpi_dropdown_locations" || $table == "glpi_dropdown_kbcategories") {
- echo "<select name=\"$myname\">";
- showTreeListSelect($table,-1, 0);
- echo "</select>";
- }
- else if($table == "glpi_dropdown_netpoint") {
- $query = "select t1.ID as ID, t1.name as netpname, t2.name as locname from glpi_dropdown_netpoint as t1";
- $query .= " left join glpi_dropdown_locations as t2 on t1.location = t2.ID";
- $query .= " order by t2.name, t1.name";
- $result = $db->query($query);
- echo "<select name=\"$myname\">";
- $i = 0;
- $number = $db->numrows($result);
- if ($number > 0) {
- while ($i < $number) {
- $output = $db->result($result, $i, "netpname");
- $loc = $db->result($result, $i, "locname");
- $ID = $db->result($result, $i, "ID");
- echo "<option value=\"$ID\">$output ($loc)</option>";
- $i++;
- }
- }
- echo "</select>";
- }
- else {
- $where="";
- if (in_array($table,$deleted_tables))
- $where="WHERE deleted='N'";
-
- $query = "SELECT * FROM $table $where ORDER BY name";
- $result = $db->query($query);
- echo "<select name=\"$myname\" size='1'>";
- $i = 0;
- $number = $db->numrows($result);
- if ($number > 0) {
- while ($i < $number) {
- $output = $db->result($result, $i, "name");
- $ID = $db->result($result, $i, "ID");
- echo "<option value=\"$ID\">$output</option>";
- $i++;
- }
- }
- echo "</select>";
- }
-}
- /*!
- \brief remplie la dropdown avec la colonne d'une table passée en argument
-*/
-
-/*
-function dropdownValue($table,$myname,$value,$bur=0) {
-
- global $deleted_tables;
-
- // Make a select box with preselected values
- $db = new DB;
- if ($table == "glpi_dropdown_locations" || $table=="glpi_dropdown_kbcategories"){
- echo "<select name=\"$myname\">";
- echo "<option value=\"0\">-----</option>";
- showTreeListSelect($table,$value, 0,$bur);
- echo "</select>";
- }
- else if($table == "glpi_dropdown_netpoint") {
- $query = "select t1.ID as ID, t1.name as netpname, t2.ID as locID from glpi_dropdown_netpoint as t1";
- $query .= " left join glpi_dropdown_locations as t2 on t1.location = t2.ID";
- $query .= " order by t1.name,t2.name ";
- $result = $db->query($query);
- echo "<select name=\"$myname\">";
- $i = 0;
- $number = $db->numrows($result);
- if ($number > 0) {
- while ($i < $number) {
- $output = $db->result($result, $i, "netpname");
- $loc = getTreeValueName("glpi_dropdown_locations",$db->result($result, $i, "locID"));
- $ID = $db->result($result, $i, "ID");
- echo "<option value=\"$ID\"";
- if ($ID==$value) echo " selected ";
- echo ">$output ($loc)</option>";
- $i++;
- }
- }
- echo "</select>";
- }
-
- else {
-
- $where="";
- if (in_array($table,$deleted_tables))
- $where="WHERE deleted='N'";
-
- $query = "SELECT * FROM $table $where ORDER BY name";
- $result = $db->query($query);
-
- echo "<select name=\"$myname\" size='1'>";
- echo "<option value=\"0\">-----</option>";
- $i = 0;
- $number = $db->numrows($result);
- if ($number > 0) {
- while ($i < $number) {
- $output = $db->result($result, $i, "name");
- $ID = $db->result($result, $i, "ID");
- if ($ID === $value) {
- echo "<option value=\"$ID\" selected>$output</option>";
-
- } else {
- echo "<option value=\"$ID\">$output</option>";
- }
- $i++;
- }
- }
- echo "</select>";
-
- if ($table=="glpi_enterprises") {
- echo getEnterpriseLinks($value);
- }
-
- }
-}
-*/
-function dropdownValue($table,$myname,$value,$bur=0) {
-
- global $deleted_tables;
-
- // Make a select box with preselected values
- $db = new DB;
- if ($table == "glpi_dropdown_locations" || $table=="glpi_dropdown_kbcategories"){
- echo "<select name=\"$myname\">";
- echo "<option value=\"0\">-----</option>";
- showTreeListSelect($table,$value, 0,$bur);
- echo "</select>";
- }
- else if($table == "glpi_dropdown_netpoint") {
- $query = "select t1.ID as ID, t1.name as netpname, t2.ID as locID from glpi_dropdown_netpoint as t1";
- $query .= " left join glpi_dropdown_locations as t2 on t1.location = t2.ID";
- $query .= " order by t1.name,t2.name ";
- $result = $db->query($query);
- echo "<select name=\"$myname\">";
- $i = 0;
- $number = $db->numrows($result);
- if ($number > 0) {
- while ($i < $number) {
- $output = $db->result($result, $i, "netpname");
- $loc = getTreeValueName("glpi_dropdown_locations",$db->result($result, $i, "locID"));
- $ID = $db->result($result, $i, "ID");
- echo "<option value=\"$ID\"";
- if ($ID==$value) echo " selected ";
- echo ">$output ($loc)</option>";
- $i++;
- }
- }
- echo "</select>";
- }
-
- //permet d'afficher une dropdown avec les différents responsables technique avec le responsable en //question sélectionné
- else if($table=="glpi_contacts")
- {
-
- $query="SELECT * FROM glpi_contacts ORDER BY name";
- $query2="SELECT * FROM glpi_computers";
- $result = $db->query($query);
- $result2=$db->query($query);
- echo "<select name=\"$myname\" size='1'>";
- $i = 0;
- $number = $db->numrows($result);
- $test=$db->result($result2,$i,"tech_num");
- if ($number > 0) {
- while ($i < $number) {
- $output = $db->result($result, $i, "name");//colonne de la table qui sera affichée dans la dropown
- $ID = $db->result($result, $i, "ID");
- $tech=$db->result($result, $i,"type");
- if($test == 0)
- {
- echo "<option value=\"NULL\">-----</option>";
- $test+=1;
- }
- if($tech == 2){
- if ($ID === $value ) {
- echo "<option value=\"$ID\" selected>$output</option>";
-
- } else {
-
- echo "<option value=\"$ID\" >$output</option>";
- }
- }
- $i++;
-
- }
-
- }
- echo "</select>";
- }
-
-
-
- else {
-
- $where="";
- if (in_array($table,$deleted_tables))
- $where="WHERE deleted='N'";
-
- $query = "SELECT * FROM $table $where ORDER BY name";
- $result = $db->query($query);
-
- echo "<select name=\"$myname\" size='1'>";
- echo "<option value=\"0\">-----</option>";
- $i = 0;
- $number = $db->numrows($result);
- if ($number > 0) {
- while ($i < $number) {
- $output = $db->result($result, $i, "name");
- $ID = $db->result($result, $i, "ID");
- if ($ID === $value) {
- echo "<option value=\"$ID\" selected>$output</option>";
-
- } else {
- echo "<option value=\"$ID\">$output</option>";
- }
- $i++;
- }
- }
- echo "</select>";
-
- if ($table=="glpi_enterprises") {
- echo getEnterpriseLinks($value);
- }
-
- }
-}
-function dropdownNoValue($table,$myname,$value) {
- // Make a select box without parameters value
-
- global $deleted_tables;
-
- $db = new DB;
-
- $where="";
- if (in_array($table,$deleted_tables))
- $where="WHERE deleted='N'";
-
- $query = "SELECT * FROM $table $where ORDER BY name";
- $result = $db->query($query);
-
- echo "<select name=\"$myname\" size='1'>";
- $i = 0;
- $number = $db->numrows($result);
- if ($number > 0) {
- while ($i < $number) {
- $output = $db->result($result, $i, "name");
- $ID = $db->result($result, $i, "ID");
- if ($ID === $value) {
- } else {
- echo "<option value=\"$ID\">$output</option>";
- }
- $i++;
- }
- }
- echo "</select>";
-}
-
-function NetpointLocationSearch($search,$myname,$location,$value='') {
-// Make a select box with preselected values for table dropdown_netpoint
- $db = new DB;
-
- $query = "SELECT t1.ID as ID, t1.name as netpointname, t2.name as locname
- FROM glpi_dropdown_netpoint AS t1
- LEFT JOIN glpi_dropdown_locations AS t2
- ON t1.location = t2.ID
- WHERE (";
- if ($location!="")
- $query.= " t2.ID = '". $location ."' AND ";
- $query.=" (t2.name LIKE '%". $search ."%'
- OR t1.name LIKE '%". $search ."%'))";
- if ($value!="")
- $query.=" OR t1.ID = '$value' ";
- $query.=" ORDER BY t1.name, t2.name";
- $result = $db->query($query);
-
- if ($db->numrows($result) == 0) {
- $query = "SELECT t1.ID as ID, t1.name as netpointname, t2.name as locname, t2.ID as locID
- FROM glpi_dropdown_netpoint AS t1
- LEFT JOIN glpi_dropdown_locations AS t2 ON t1.location = t2.ID
- ORDER BY t1.name, t2.name";
- $result = $db->query($query);
- }
-
-
- echo "<select name=\"$myname\" size='1'>";
- echo "<option value=\"0\">---</option>";
-
- if($db->numrows($result) > 0) {
- while($line = $db->fetch_array($result)) {
- echo "<option value=\"". $line["ID"] ."\" ";
- if ($value==$line["ID"]) echo " selected ";
- echo ">". $line["netpointname"]." (".getTreeValueName("glpi_dropdown_locations",$line["locID"]) .")</option>";
- }
- }
- echo "</select>";
-}
-
-function dropdownValueSearch($table,$myname,$value,$search) {
- // Make a select box with preselected values
- if(is_string($search))
- {
- $db = new DB;
-
- $query = "SELECT * FROM $table WHERE name LIKE '%$search%' ORDER BY name";
- $result = $db->query($query);
-
-
- $number = $db->numrows($result);
- if ($number == 0) {
- $query = "SELECT * FROM $table ORDER BY name";
- $result = $db->query($query);
- $number = $db->numrows($result);
- }
-
- echo "<select name=\"$myname\" size='1'>";
-
- if ($number > 0) {
- $i = 0;
- while ($i < $number) {
- if ($table=="glpi_software")
- $output = $db->result($result, $i, "name")." ".$db->result($result, $i, "version");
- else
- $output = $db->result($result, $i, "name");
- $ID = $db->result($result, $i, "ID");
-
- if ($ID == $value) {
- echo "<option value=\"$ID\" selected>$output</option>";
- } else {
- echo "<option value=\"$ID\">$output</option>";
- }
- $i++;
- }
- }
- echo "</select>";
- }
- else
- {
- $db = new DB;
-
- $query = "SELECT * FROM $table WHERE Parentid LIKE '$search' ORDER BY name";
- $result = $db->query($query);
-
-
- $number = $db->numrows($result);
- if ($number == 0) {
- $query = "SELECT * FROM $table ORDER BY name";
- $result = $db->query($query);
- $number = $db->numrows($result);
- }
-
- echo "<select name=\"$myname\" size='1'>";
-
- if ($number > 0) {
- $i = 0;
- while ($i < $number) {
- if ($table=="glpi_software")
- $output = $db->result($result, $i, "name")." ".$db->result($result, $i, "version");
- else
- $output = $db->result($result, $i, "name");
- $ID = $db->result($result, $i, "ID");
-
- if ($ID == $value) {
- echo "<option value=\"$ID\" selected>$output</option>";
- } else {
- echo "<option value=\"$ID\">$output</option>";
- }
- $i++;
- }
- }
- echo "</select>";
- }
-}
-
-function dropdownUsers($value, $myname) {
- // Make a select box with all glpi users
-
- $db = new DB;
- $query = "SELECT * FROM glpi_users WHERE (".searchUserbyType("normal").") ORDER BY name";
- $result = $db->query($query);
-
- echo "<select name=\"$myname\">";
- $i = 0;
-
- $number = $db->numrows($result);
- echo "<option value=\"\">[ Nobody ]</option>";
- if ($number > 0) {
- while ($i < $number) {
- $output = unhtmlentities($db->result($result, $i, "name"));
- if ($output == $value) {
- echo "<option value=\"$output\" selected>".$output;
- } else {
- echo "<option value=\"$output\">".$output;
- }
- $i++;
- echo "</option>";
- }
- }
- echo "</select>";
-}
-
-
-function getDropdownName($table,$id) {
- global $cfg_install;
- $db = new DB;
- $name = "";
- $query = "select * from ". $table ." where ID = '". $id ."'";
- if ($result = $db->query($query))
- if($db->numrows($result) != 0) {
- if ($table=="glpi_dropdown_locations"||$table=="glpi_dropdown_kbcategories"){
- $name=getTreeValueName($table,$id);
-
- } else {
- $name = $db->result($result,0,"name");
- if ($table=="glpi_dropdown_netpoint")
- $name .= " (".getDropdownName("glpi_dropdown_locations",$db->result($result,0,"location")).")";
- }
- if ($table=="glpi_enterprises"){
- $name.=getEnterpriseLinks($id);
-
- }
- }
- return $name;
-}
-
-function dropdownUsersTracking($value, $myname,$champ) {
- // Make a select box with all glpi users in tracking table
- global $lang;
- $db = new DB;
- $query = "SELECT DISTINCT glpi_tracking.$champ AS NAME FROM glpi_tracking WHERE glpi_tracking.$champ <> '' ORDER BY glpi_tracking.$champ";
- $result = $db->query($query);
-
- echo "<select name=\"$myname\">";
- $i = 0;
- $number = $db->numrows($result);
- if ($number > 0) {
- echo "<option value=\"all\">".$lang["reports"][16]."\n";
- while ($i < $number) {
- $name = $db->result($result, $i, "NAME");
- if ($name == $value) {
- echo "<option value=\"$name\" selected>".$name;
- } else {
- echo "<option value=\"$name\">".$name;
- }
- $i++;
- echo "</option>";
- }
- }
- echo "</select>";
-}
-
-function dropdownAllItems($name,$search='',$value='') {
- $db=new DB;
-
- $items=array(
- COMPUTER_TYPE=>"glpi_computers",
- NETWORKING_TYPE=>"glpi_networking",
- PRINTER_TYPE=>"glpi_printers",
- MONITOR_TYPE=>"glpi_monitors",
- PERIPHERAL_TYPE=>"glpi_peripherals",
- SOFTWARE_TYPE=>"glpi_software",
- );
-
- echo "<select name=\"$name\" size='1'>";
-
- foreach ($items as $type => $table){
-
- $where="WHERE '1' = '1' ";
- if ($table=="glpi_computers")
- $where.="AND is_template='0' ";
-
- if (!empty($search))
- $where.="AND name LIKE '%$search%' ";
-
-// if ($table=="glpi_enterprises"||$table=="glpi_cartridge_type")
-// $where = "WHERE deleted='N' ";
-
- $query = "SELECT ID FROM $table $where ORDER BY name";
-
- $result = $db->query($query);
-
- $i = 0;
- $number = $db->numrows($result);
-
- if ($number > 0) {
- while ($i < $number) {
- $ID=$db->result($result, $i, "ID");
- $ci=new CommonItem;
- $ci->getFromDB($type,$ID);
- $output=$ci->getType()." - ".$ci->getName();
- if (createAllItemsSelectValue($type,$ID) === $value) {
- echo "<option value=\"".$type."_".$ID."\" selected>$output</option>";
- } else {
- echo "<option value=\"".$type."_".$ID."\">$output</option>";
- }
- $i++;
- }
- }
- }
- echo "</select>";
-
-}
-
-function createAllItemsSelectValue($type,$ID){
- return $type."_".$ID;
-}
-
-function explodeAllItemsSelectResult($val){
- $splitter=split("_",$val);
- return array($splitter[0],$splitter[1]);
-}
-
-
-function loadLanguage() {
-
- GLOBAL $lang,$cfg_install;
-
- if(empty($_SESSION["glpilanguage"]))
- {
- $file= "/glpi/dicts/".$cfg_install["languages"][$cfg_install["default_language"]][1];
- }
- else {
- //$file = "/glpi/dicts/".$_SESSION["glpilanguage"].".php";
-
- $file = "/glpi/dicts/".$cfg_install["languages"][$_SESSION["glpilanguage"]][1];
-
- }
- include ("_relpos.php");
- include ($phproot . $file);
-}
-
-
-function showConnect($target,$ID,$type) {
- // Prints a direct connection to a computer
-
- GLOBAL $lang, $cfg_layout, $cfg_install;
-
- $connect = new Connection;
- $connect->type=$type;
- $computer = $connect->getComputerContact($ID);
-
- echo "<br><center><table width='50%' class='tab_cadre'><tr><th colspan='2'>";
- echo $lang["connect"][0].":";
- echo "</th></tr>";
-
- if ($computer) {
- $connect->getComputerData($computer);
- echo "<tr><td class='tab_bg_1".($connect->deleted=='Y'?"_2":"")."'><b>Computer: ";
- echo "<a href=\"".$cfg_install["root"]."/computers/computers-info-form.php?ID=".$connect->device_ID."\">";
- echo $connect->device_name." (".$connect->device_ID.")";
- echo "</a>";
- echo "</b></td>";
- echo "<td class='tab_bg_2".($connect->deleted=='Y'?"_2":"")."' align='center'><b>";
- echo "<a href=\"$target?disconnect=1&ID=$ID\">".$lang["connect"][3]."</a>";
- } else {
- echo "<tr><td class='tab_bg_1'><b>Computer: </b>";
- echo "<i>".$lang["connect"][1]."</i>";
- echo "</td>";
- echo "<td class='tab_bg_2' align='center'><b>";
- echo "<a href=\"$target?connect=1&ID=$ID\">".$lang["connect"][2]."</a>";
- }
-
- echo "</b></td>";
- echo "</tr>";
- echo "</table></center><br>";
-}
-
-function Disconnect($ID,$type) {
- // Disconnects a direct connection
-
- $connect = new Connection;
- $connect->type=$type;
- $connect->deletefromDB($ID);
-}
-
-function Connect($target,$sID,$cID,$type) {
- global $lang;
- // Makes a direct connection
-
- $connect = new Connection;
- $connect->end1=$sID;
- $connect->end2=$cID;
- $connect->type=$type;
- $connect->addtoDB();
- // Mise a jour lieu du periph si nécessaire
- $dev=new CommonItem();
- $dev->getFromDB($type,$sID);
-
- $comp=new Computer();
- $comp->getFromDB($cID);
- if ($comp->fields['location']!=$dev->obj->fields['location']){
- $updates[0]="location";
- $dev->obj->fields['location']=$comp->fields['location'];
- $dev->obj->updateInDB($updates);
- $_SESSION["MESSAGE_AFTER_REDIRECT"]=$lang["computers"][48];
-
- }
-
-}
-
-function showConnectSearch($target,$ID,$type="computer") {
-
- GLOBAL $cfg_layout,$cfg_install, $lang;
-
- echo "<center><table class='tab_cadre'>";
- echo "<tr><th colspan='2'>".$lang["connect"][4]." :</th></tr>";
- echo "<tr class='tab_bg_1'>";
- echo "<form method='post' action=\"$target\">";
- echo "<td>";
- switch($type){
- case "computer" :
- echo $lang["connect"][5];
- break;
- case "printer" :
- echo $lang["connect"][13];
- break;
- case "peripheral" :
- echo $lang["connect"][14];
- break;
- case "monitor" :
- echo $lang["connect"][15];
- break;
-
- default : // computer
- echo "<tr><th colspan='2'>ERROR :</th></tr>";
- }
-
- echo " <select name=type>";
- echo "<option value=name>".$lang["connect"][6]."</option>";
- echo "<option value=id>".$lang["connect"][7]."</option>";
- echo "</select> ";
- echo $lang["connect"][8]." <input type='text' size=10 name=search>";
- echo "<input type='hidden' name='pID1' value=$ID>";
- echo "<input type='hidden' name='device_type' value=$type>";
- echo "<input type='hidden' name='connect' value='2'>";
- echo "</td><td class='tab_bg_2'>";
- echo "<input type='submit' value=\"".$lang["buttons"][11]."\" class='submit'>";
- echo "</td></tr>";
-
- echo "</form>";
- echo "</table>";
- echo "</center>";
-}
-
-
-function listConnectComputers($target,$input) {
-
- GLOBAL $cfg_layout,$cfg_install, $lang;
-
- $pID1 = $input["pID1"];
-
- echo "<center><table class='tab_cadre'>";
- echo "<tr><th colspan='2'>".$lang["connect"][9].":</th></tr>";
- echo "<form method='post' action=\"$target\"><tr><td>";
-
- echo "<tr class='tab_bg_1'>";
- echo "<td align='center'>";
-
- $db = new DB;
- if ($input["type"] == "name") {
- $query = "SELECT glpi_computers.ID as ID,glpi_computers.name as name, glpi_dropdown_locations.ID as location from glpi_computers left join glpi_dropdown_locations on glpi_computers.location = glpi_dropdown_locations.id WHERE glpi_computers.deleted = 'N' AND glpi_computers.name LIKE '%".$input["search"]."%' order by name ASC";
- } else {
- $query = "SELECT glpi_computers.ID as ID,glpi_computers.name as name, glpi_dropdown_locations.ID as location from glpi_computers left join glpi_dropdown_locations on glpi_computers.location = glpi_dropdown_locations.id WHERE glpi_computers.deleted = 'N' AND glpi_computers.ID LIKE '%".$input["search"]."%' order by name ASC";
- }
- $result = $db->query($query);
- $number = $db->numrows($result);
- echo "<select name=\"cID\">";
- while ($i < $number) {
- $dID = $db->result($result, $i, "ID");
- $name = $db->result($result, $i, "name");
- $location = $db->result($result, $i, "location");
- echo "<option value=\"$dID\">".$name." (".getTreeValueName("glpi_dropdown_locations",$location).")</option>";
- $i++;
- }
- echo "</select>";
-
- echo "</td>";
- echo "<td class='tab_bg_2' align='center'>";
- echo "<input type='hidden' name='sID' value=\"".$input["pID1"]."\">";
- echo "<input type='hidden' name='connect' value='3'>";
- echo "<input type='hidden' name='device_type' value='computer'>";
- echo "<input type='submit' value=\"".$lang["buttons"][9]."\" class='submit'>";
- echo "</td></form></tr></table>";
-
-}
-
-function listConnectElement($target,$input) {
-
- GLOBAL $cfg_layout,$cfg_install, $lang;
-
- $pID1 = $input["pID1"];
- $device_type=$input["device_type"];
- $table="";
- switch($device_type){
- case "printer":
- $table="glpi_printers";$device_id=PRINTER_TYPE;break;
- case "monitor":
- $table="glpi_monitors";$device_id=MONITOR_TYPE;break;
- case "peripheral":
- $table="glpi_peripherals";$device_id=PERIPHERAL_TYPE;break;
-
- }
-
- echo "<center><table class='tab_cadre'>";
- echo "<tr><th colspan='2'>";
- switch($device_type){
- case "printer":
- echo $lang["connect"][10];break;
- case "monitor":
- echo $lang["connect"][12];break;
- case "peripheral":
- echo $lang["connect"][11];break;
- }
-
-
- echo ":</th></tr>";
- echo "<form method='post' action=\"$target\"><tr><td>";
-
- echo "<tr class='tab_bg_1'>";
- echo "<td align='center'>";
-
- $db = new DB;
- if ($input["type"] == "name") {
- $query = "SELECT $table.ID as ID,$table.name as name, glpi_dropdown_locations.ID as location from $table left join glpi_dropdown_locations on $table.location = glpi_dropdown_locations.id left join glpi_connect_wire on ($table.ID = glpi_connect_wire.end1 AND glpi_connect_wire.type = $device_id) WHERE $table.deleted='N' AND $table.name LIKE '%".$input["search"]."%' AND glpi_connect_wire.ID IS NULL order by name ASC";
- } else {
- $query = "SELECT $table.ID as ID,$table.name as name, glpi_dropdown_locations.ID as location from $table left join glpi_dropdown_locations on $table.location = glpi_dropdown_locations.id left join glpi_connect_wire on ($table.ID = glpi_connect_wire.end1 AND glpi_connect_wire.type = $device_id) WHERE $table.deleted='N' AND $table.ID LIKE '%".$input["search"]."%' AND glpi_connect_wire.ID IS NULL order by name ASC";
- }
-// echo $query;
- $result = $db->query($query);
- $number = $db->numrows($result);
- if ($number>0) {
- echo "<select name=\"ID\">";
- while ($i < $number) {
- $dID = $db->result($result, $i, "ID");
- $name = $db->result($result, $i, "name");
- $location = $db->result($result, $i, "location");
- echo "<option value=\"$dID\">".$name." (".getTreeValueName("glpi_dropdown_locations",$location).")</option>";
- $i++;
- }
- echo "</select>";
-
- echo "</td>";
- echo "<td class='tab_bg_2' align='center'>";
- echo "<input type='hidden' name='cID' value=\"".$input["pID1"]."\">";
- echo "<input type='hidden' name='connect' value='3'>";
- echo "<input type='hidden' name='device_type' value='$device_id'>";
- echo "<input type='submit' value=\"".$lang["buttons"][9]."\" class='submit'>";
- } else echo $lang["connect"][16]."<br><b><a href=\"".$_SERVER["PHP_SELF"]."?ID=".$input["pID1"]."\">".$lang["buttons"][13]."</a></b>";
-
- echo "</td></form></tr></table>";
-
-}
-
-function printHelpDesk ($name,$from_helpdesk) {
-
- GLOBAL $cfg_layout,$cfg_install,$lang,$cfg_features;
-
- $db = new DB;
-
- $query = "SELECT email,realname,name FROM glpi_users WHERE (name = '$name')";
- $result=$db->query($query);
- $email = $db->result($result,0,"email");
- $realname = $db->result($result,0,"realname");
- $name = $db->result($result,0,"name");
-
- echo "<form method='post' name=\"helpdeskform\" action=\"".$cfg_install["root"]."/tracking/tracking-injector.php\">";
- echo "<input type='hidden' name='from_helpdesk' value='$from_helpdesk'>";
-
- echo "<center><table class='tab_cadre'>";
-
- if ($realname!='') $name=$realname;
-
- echo "<tr><th colspan='2'>".$lang["help"][0]." $name, ".$lang["help"][1].":</th></tr>";
- echo "<tr class='tab_bg_1'>";
- echo "<td>".$lang["help"][2].": </td>";
- echo "<td>";
- dropdownPriority("priority",3);
- echo "</td></tr>";
- if($cfg_features["mailing"] != 0)
- {
- echo "<tr class='tab_bg_1'>";
- echo "<td>".$lang["help"][8].":</td>";
- echo "<td> <select name='emailupdates'>";
- echo "<option value='no' selected>".$lang["help"][9]."";
- echo "<option value='yes'>".$lang["help"][10]."";
- echo "</select>";
- echo "</td></tr>";
- echo "<tr class='tab_bg_1'>";
- echo "<td>".$lang["help"][11].":</td>";
- echo "<td> <input name='uemail' value=\"$email\" size='20'>";
- echo "</td></tr>";
- }
-
- echo "<tr class='tab_bg_1'>";
- echo "<td>".$lang["help"][12]." <a href=\"#\" onClick=\"window.open('".$cfg_install["root"]."/find_num.php','Help','scrollbars=1,resizable=1,width=400,height=400')\"><img src=\"".$cfg_install["root"]."/pics/aide.png\" alt=\"help\"></a></td>";
- echo "<td><input name='computer' size='10'>";
- echo "</td>";
- echo "</tr>";
-
- echo "<tr class='tab_bg_1'>";
- echo "<td>".$lang["help"][24].": </td>";
- echo "<td><select name=device_type>";
- //if (isAdmin($_SESSION["glpitype"]))
- echo "<option value='0' >".$lang["help"][30]."";
- echo "<option value='1' selected>".$lang["help"][25]."";
- echo "<option value='2'>".$lang["help"][26]."";
- echo "<option value='3'>".$lang["help"][27]."";
- echo "<option value='4'>".$lang["help"][28]."";
- echo "<option value='5'>".$lang["help"][29]."";
- echo "<option value='6'>".$lang["help"][31]."";
- echo "</select>";
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_1'>";
- echo "<td colspan='2' align='center'>".$lang["help"][13].":</td>";
- echo "</tr>";
- echo "<tr class='tab_bg_1'>";
- echo "<td colspan='2' align='center'><textarea name='contents' cols='45' rows='14' ></textarea>";
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_1'>";
- echo "<td colspan='2' align='center'> <input type='submit' value=\"".$lang["help"][14]."\" class='submit'>";
- echo "<input type='hidden' name='IRMName' value=\"$name\">";
- echo "</td></tr>";
-
- echo "</table>";
- echo "</center>";
- echo "</form>";
-
-}
-
-function printPager($start,$numrows,$target,$parameters) {
-
- GLOBAL $cfg_layout, $cfg_features, $lang;
-
- // Forward is the next step forward
- $forward = $start+$cfg_features["list_limit"];
-
- // This is the end, my friend
- $end = $numrows-$cfg_features["list_limit"];
-
- // Human readable count starts here
- $current_start=$start+1;
-
- // And the human is viewing from start to end
- $current_end = $current_start+$cfg_features["list_limit"]-1;
- if ($current_end>$numrows) {
- $current_end = $numrows;
- }
-
- // Backward browsing
- if ($current_start-$cfg_features["list_limit"]<=0) {
- $back=0;
- } else {
- $back=$start-$cfg_features["list_limit"];
- }
-
- // Print it
- echo "<br><center><table class='tab_cadre2' width='750'>";
- echo "<tr>";
-
- // Back and fast backward button
- if (!$start==0) {
- echo "<th align='left'>";
- echo "<a href=\"$target?$parameters&start=$back\">";
- echo " < ";
- echo "</a></th>";
- echo "<th align='left'>";
- echo "<a href=\"$target?$parameters&start=0\">";
- echo " << ";
- echo "</a></th>";
- }
-
- // Print the "where am I?"
- echo "<td width='750' align='center' class='tab_bg_2'><b>";
- echo $lang["pager"][2]." ".$current_start." ".$lang["pager"][1]." ".$current_end." ".$lang["pager"][3]." ".$numrows." ";
- echo "</b></td>";
-
- // Forward and fast forward button
- if ($forward<$numrows) {
- echo "<th align='right'>";
- echo "<a href=\"$target?$parameters&start=$forward\">";
- echo " > ";
- echo "</a></th>";
- echo "<th align='right'>";
- echo "<a href=\"$target?$parameters&start=$end\">";
- echo " >> ";
- echo "</a></th>";
- }
-
- // End pager
- echo "</tr>";
- echo "</table></center>";
-}
-
-function report_perso($item_type,$query)
-//affiche un rapport personalisé a partir d'une requete $query
-//pour un type de materiel ($item_type)
-{
-
-GLOBAL $cfg_layout, $cfg_features, $lang;
-
-$db = new DB;
-$result = $db->query($query);
-include ("_relpos.php");
-
-
-switch($item_type)
- {
- case 'glpi_computers' :
-
-
- echo " <strong>".$lang["reports"][5]."</strong>";
- echo "<table width='100%' height='60' border='0' bordercolor='black'>";
- echo "<tr>";
- echo "<th><div align='center'><b>".$lang["computers"][7]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["computers"][16]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["computers"][9]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["computers"][21]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["computers"][22]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["computers"][10]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["computers"][17]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["computers"][23]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["computers"][24]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["computers"][41]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["computers"][42]."</b></div></th>";
- echo "</tr>";
- while( $ligne = $db->fetch_array($result))
- {
-
- $name = $ligne['name'];
- $os = $ligne['os'];
- $processor = $ligne['processor'];
- $processor_speed = $ligne['processor_speed'];
- $lieu = $ligne['location'];
- $serial = $ligne['serial'];
- $ramType = $ligne['ramtype'];
- $ramSize = $ligne['ram'];
- $contact = $ligne['contact'];
- $achat_date = $ligne['achat_date'];
- $fin_garantie = $ligne['date_fin_garantie'];
-
- //inserer ces valeures dans un tableau
-
- echo "<tr>";
- if($name) echo "<td><div align='center'> $name </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($contact) echo "<td><div align='center'> $contact </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($os) echo "<td><div align='center'> ".getDropdownName("glpi_dropdown_os",$os)." </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($processor) echo "<td><div align='center'> ".getDropdownName("glpi_dropdown_processor",$processor)." </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($processor_speed) echo "<td><div align='center'> $processor_speed </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($lieu) echo "<td><div align='center'> ".getDropdownName("glpi_dropdown_locations",$lieu)." </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($serial) echo "<td><div align='center'> $serial </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($ramType) echo "<td><div align='center'> ".getDropdownName("glpi_dropdown_ram",$ramType)." </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($ramSize) echo "<td><div align='center'> $ramSize </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($achat_date) echo "<td><div align='center'> $achat_date </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($fin_garantie) echo "<td><div align='center'> $fin_garantie </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- echo "</tr>";
- }
- echo "</table><br><hr><br> ";
- break;
-
- case 'glpi_printers' :
-
- echo "<b><strong>".$lang["reports"][1]."</strong></b>";
- echo "<table width='100%' height='60' border='0'>";
- echo "<tr> ";
- echo "<th><div align='center'><b>".$lang["printers"][5]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["printers"][8]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["printers"][9]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["printers"][6]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["printers"][10]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["printers"][23]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["printers"][20]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["printers"][21]."</b></div></th>";
- echo "</tr>";
-
- while( $ligne = $db->fetch_array($result))
- {
- $type = $ligne['type'];
- $name = $ligne['name'];
- $lieu = $ligne['location'];
- $serial = $ligne['serial'];
- $contact = $ligne['contact'];
- $achat_date = $ligne['achat_date'];
- $fin_garantie = $ligne['date_fin_garantie'];
- $ramSize = $ligne['ramSize'];
-
- //inserer ces valeures dans un tableau
- echo "<tr>";
- if($name) echo "<td><div align='center'>$name</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($contact) echo "<td><div align='center'>$contact</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($type) echo "<td><div align='center'>".getDropdownName("glpi_type_printers",$type)."</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($lieu) echo "<td><div align='center'>".getDropdownName("glpi_dropdown_locations",$lieu)."</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($serial) echo "<td><div align='center'>$serial</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($ramSize) echo "<td><div align='center'>$ramSize</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($achat_date) echo "<td><div align='center'>$achat_date</div></td>"; else echo "<td><div align='center'> N/A</div> </td>";
- if($fin_garantie) echo "<td><div align='center'> $fin_garantie </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- echo "</tr>";
- }
- echo "</table><br><hr><br>";
- break;
-
- case 'glpi_monitors' :
-
- echo " <b><strong>".$lang["reports"][2]."</strong></b>";
- echo "<table width='100%' height='60' border='0'>";
- echo "<tr> ";
- echo "<th><div align='center'><b>".$lang["monitors"][5]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["monitors"][9]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["monitors"][21]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["monitors"][8]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["monitors"][6]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["monitors"][10]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["monitors"][24]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["monitors"][25]."</b></div></th>";
- echo "</tr>";
-
- while( $ligne = $db->fetch_array($result))
- {
- $name = $ligne['name'];
- $lieu = $ligne['location'];
- $type = $ligne['type'];
- $contact = $ligne['contact'];
- $serial = $ligne['serial'];
- $achat_date = $ligne['achat_date'];
- $size = $ligne['size'];
- $fin_garantie = $ligne['date_fin_garantie'];
- //inserer ces valeures dans un tableau
-
- echo "<tr>";
- if($name) echo "<td><div align='center'>$name</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($type) echo "<td><div align='center'>".getDropdownName("glpi_type_monitors",$type)."</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($size) echo "<td><div align='center'>$size</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($contact) echo "<td><div align='center'>$contact</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($lieu) echo "<td><div align='center'>".getDropdownName("glpi_dropdown_locations",$lieu)."</div></td>"; else echo "<td><div align='center'>N/A </div></td>";
- if($serial) echo "<td><div align='center'>$serial</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($achat_date) echo "<td><div align='center'>$achat_date</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($fin_garantie) echo "<td><div align='center'> $fin_garantie </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- echo "</tr>";
- }
- echo "</table><br><hr><br>";
- break;
-
- case 'glpi_networking' :
-
- echo " <b><strong>".$lang["reports"][3]."</strong></b>";
- echo "<table width='100%' height='60' border='0'>";
- echo "<tr> ";
- echo "<th><div align='center'><b>".$lang["networking"][0]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["networking"][2]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["networking"][3]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["networking"][1]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["networking"][6]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["networking"][39]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["networking"][40]."</b></div></th>";
- echo "</tr>";
-
- while( $ligne = $db->fetch_array($result))
- {
- $name = $ligne['name'];
- $lieu = $ligne['location'];
- $type = $ligne['type'];
- $contact = $ligne['contact'];
- $serial = $ligne['serial'];
- $achat_date = $ligne['achat_date'];
- $fin_garantie = $ligne['date_fin_garantie'];
- //inserer ces valeures dans un tableau
-
- echo "<tr> ";
- if($name) echo "<td><div align='center'>$name</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($type) echo "<td><div align='center'></div>".getDropdownName("glpi_type_networking",$type)."</td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($contact) echo "<td><div align='center'>$contact</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($lieu) echo "<td><div align='center'>".getDropdownName("glpi_dropdown_locations",$lieu)."</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($serial) echo "<td><div align='center'>$serial</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($achat_date) echo "<td><div align='center'>$achat_date</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($fin_garantie) echo "<td><div align='center'> $fin_garantie </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- echo "</tr>";
- }
- echo "</table><br><hr><br>";
- break;
- case 'glpi_peripherals' :
-
- echo " <b><strong>".$lang["reports"][30]."</strong></b>";
- echo "<table width='100%' height='60' border='0'>";
- echo "<tr> ";
- echo "<th><div align='center'><b>".$lang["peripherals"][5]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["peripherals"][9]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["peripherals"][8]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["peripherals"][6]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["peripherals"][10]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["peripherals"][24]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["peripherals"][25]."</b></div></th>";
- echo "</tr>";
-
- while( $ligne = $db->fetch_array($result))
- {
- $name = $ligne['name'];
- $lieu = $ligne['location'];
- $type = $ligne['type'];
- $contact = $ligne['contact'];
- $serial = $ligne['serial'];
- $achat_date = $ligne['achat_date'];
- $fin_garantie = $ligne['date_fin_garantie'];
- //inserer ces valeures dans un tableau
-
- echo "<tr>";
- if($name) echo "<td><div align='center'>$name</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($type) echo "<td><div align='center'>".getDropdownName("glpi_type_peripherals",$type)."</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($contact) echo "<td><div align='center'>$contact</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($lieu) echo "<td><div align='center'>".getDropdownName("glpi_dropdown_locations",$lieu)."</div></td>"; else echo "<td><div align='center'>N/A </div></td>";
- if($serial) echo "<td><div align='center'>$serial</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($achat_date) echo "<td><div align='center'>$achat_date</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($fin_garantie) echo "<td><div align='center'> $fin_garantie </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- echo "</tr>";
- }
- echo "</table><br><hr><br>";
- break;
-
- //rapport reseau par etage
- case 'glpi_networking_etage' :
- echo "<table width='100%' height='60' border='0'>";
- echo "<tr> ";
- //echo "<th><div align='center'><b>".$lang["reports"][34]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][35]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][37]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][41]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][46]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][47]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][36]."</b></div></th>";
- echo "</tr>";
-
- while( $ligne = $db->fetch_array($result))
- {
- //echo $ligne['location'];
- //print_r($ligne);
- $bureau = $ligne['bureau'];
- //$etage=$ligne['etage'];
- $prise=$ligne['prise'];
- $port=$ligne['port'];
- $switch=$ligne['switch'];
- $portordi=$ligne['portordi'];
- $ordi=$ligne['ordi'];
- //inserer ces valeures dans un tableau
-
- echo "<tr>";
- //if($etage) echo "<td><div align='center'>$etage</div></td>"; else echo //"<td><div align='center'> N/A </div></td>";
- if($bureau) echo "<td><div align='center'>$bureau</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($prise) echo "<td><div align='center'>$prise</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($switch) echo "<td><div align='center'>$switch</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($port) echo "<td><div align='center'>$port</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($portordi) echo "<td><div align='center'>$portordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($ordi) echo "<td><div align='center'>$ordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- }
- echo "</table><br><hr><br>";
- break;
-
- //rapport reseau par bureau
- case 'glpi_networking_bureau' :
- echo "<table width='100%' height='60' border='0'>";
- echo "<tr> ";
- //echo "<th><div align='center'><b>".$lang["reports"][34]."</b></div></th>";
- //echo "<th><div align='center'><b>".$lang["reports"][35]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][37]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][41]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][46]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][47]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][36]."</b></div></th>";
- echo "</tr>";
-
- while( $ligne = $db->fetch_array($result))
- {
- //echo $ligne['location'];
- //print_r($ligne);
- //$bureau = $ligne['bureau'];
- //$etage=$ligne['etage'];
- $prise=$ligne['prise'];
- $port=$ligne['port'];
- $switch=$ligne['switch'];
- $portordi=$ligne['portordi'];
- $ordi=$ligne['ordi'];
- //inserer ces valeures dans un tableau
-
- echo "<tr>";
- /*if($etage) echo "<td><div align='center'>$etage</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($bureau) echo "<td><div align='center'>$bureau</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- */
- if($prise) echo "<td><div align='center'>$prise</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($switch) echo "<td><div align='center'>$switch</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($port) echo "<td><div align='center'>$port</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($portordi) echo "<td><div align='center'>$portordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($ordi) echo "<td><div align='center'>$ordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- }
- echo "</table><br><hr><br>";
- break;
-
- //rapport reseau par switch
- case 'glpi_networking_switch' :
- echo "<table width='100%' height='60' border='0'>";
- echo "<tr> ";
- //echo "<th><div align='center'><b>".$lang["reports"][42]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][35]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][39]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][37]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][46]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][47]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][36]."</b></div></th>";
- echo "</tr>";
-
- while( $ligne = $db->fetch_array($result))
- {
- //$switch = $ligne['switch'];
- //echo $ligne['location'];
- //print_r($ligne);
- $bureau=$ligne['bureau'];
- $etage=$ligne['etage'];
- $prise=$ligne['prise'];
- $port = $ligne['port'];
- $portordi=$ligne['portordi'];
- $ordi=$ligne['ordi'];
-
- //inserer ces valeures dans un tableau
-
- echo "<tr>";
- //if($switch) echo "<td><div align='center'>$switch</div></td>"; else echo //"<td><div align='center'> N/A </div></td>";
- if($bureau) echo "<td><div align='center'>$bureau</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($etage) echo "<td><div align='center'>$etage</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($prise) echo "<td><div align='center'>$prise</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($port) echo "<td><div align='center'>$port</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($portordi) echo "<td><div align='center'>$portordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($ordi) echo "<td><div align='center'>$ordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- }
- echo "</table><br><hr><br>";
- break;
-
- //rapport reseau par prise
- case 'glpi_networking_prise' :
- echo "<table width='100%' height='60' border='0'>";
- echo "<tr> ";
- //echo "<th><div align='center'><b>".$lang["reports"][44]."</b></div></th>";
- //echo "<th><div align='center'><b>".$lang["reports"][39]."</b></div></th>";
- //echo "<th><div align='center'><b>".$lang["reports"][43]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][42]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][46]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][47]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][36]."</b></div></th>";
- echo "</tr>";
-
- while( $ligne = $db->fetch_array($result))
- {
- $prise=$ligne['prise'];
- $bureau = $ligne['bureau'];
- $etage=$ligne['etage'];
- $switch=$ligne['switch'];
- $port=$ligne['port'];
- $portordi=$ligne['portordi'];
- $ordi=$ligne['ordi'];
- //echo $ligne['location'];
- //print_r($ligne);
- //$ports=$ligne['ports'];
- //$ifaddr = $ligne['ifaddr'];
-
-
- //inserer ces valeures dans un tableau
-
- echo "<tr>";
- //if($prise) echo "<td><div align='center'>$prise</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- //if($etage) echo "<td><div align='center'>$etage</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- //if($bureau) echo "<td><div align='center'>$bureau</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($switch) echo "<td><div align='center'>$switch</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($port) echo "<td><div align='center'>$port</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($portordi) echo "<td><div align='center'>$portordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($ordi) echo "<td><div align='center'>$ordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- }
- echo "</table><br><hr><br>";
- break;
-
- }
-}
-
-function countElementsInTable($table){
-$db=new DB;
-$query="SELECT count(*) as cpt from $table";
-$result=$db->query($query);
-$ligne = $db->fetch_array($result);
-return $ligne['cpt'];
-}
-
-
-//****************
-// De jolies fonctions pour améliorer l'affichage du texte de la FAQ/knowledgbase
-//***************
-
-
-function autop($pee, $br=1) {
-
-// Remplace trés AVANTAGEUSEMENT nl2br
-// Met en "ordre" une chaine avant affichage
-
-// Thanks to Matthew Mullenweg
-
-$pee = preg_replace("/(\r\n|\n|\r)/", "\n", $pee); // cross-platform newlines
-$pee = preg_replace("/\n\n+/", "\n\n", $pee); // take care of duplicates
-$pee = preg_replace('/\n?(.+?)(\n\n|\z)/s', "<p>$1</p>\n", $pee); // make paragraphs, including one at the end
-if ($br) $pee = preg_replace('|(?<!</p>)\s*\n|', "<br>\n", $pee); // optionally make line breaks
-return $pee;
-}
-
-
-
-function clicurl($chaine){
-
-// Rend une url cliquable htp/https/ftp meme avec une variable Get
-
-$text=preg_replace("`((?:https?|ftp)://\S+)(\s|\z)`", '<a href="$1">$1</a>$2', $chaine);
-
-return $text;
-}
-
-
-//
-// Split the message into tokens ($inside contains all text inside $start and $end, and $outside contains all text outside)
-//
-function split_text($text, $start, $end)
-{
-
-// Adapté de PunBB
-//Copyright (C) Rickard Andersson ([EMAIL PROTECTED])
-
- $tokens = explode($start, $text);
-
- $outside[] = $tokens[0];
-
- $num_tokens = count($tokens);
- for ($i = 1; $i < $num_tokens; ++$i)
- {
- $temp = explode($end, $tokens[$i]);
- $inside[] = $temp[0];
- $outside[] = $temp[1];
- }
-
-
-
- return array($inside, $outside);
-}
-
-
-
-
-
-function rembo($string){
-
-// Adapté de PunBB
-//Copyright (C) Rickard Andersson ([EMAIL PROTECTED])
-
-
-
-// If the message contains a code tag we have to split it up (text within [code][/code] shouldn't be touched)
- if (strpos($string, '[code]') !== false && strpos($string, '[/code]') !== false)
- {
- list($inside, $outside) = split_text($string, '[code]', '[/code]');
- $outside = array_map('trim', $outside);
- $string = implode('<">', $outside);
- }
-
-
-
-
- $pattern = array('#\[b\](.*?)\[/b\]#s',
- '#\[i\](.*?)\[/i\]#s',
- '#\[u\](.*?)\[/u\]#s',
- '#\[s\](.*?)\[/s\]#s',
- '#\[c\](.*?)\[/c\]#s',
- '#\[g\](.*?)\[/g\]#s',
- //'#\[url\](.*?)\[/url\]#e',
- //'#\[url=(.*?)\](.*?)\[/url\]#e',
- '#\[email\](.*?)\[/email\]#',
- '#\[email=(.*?)\](.*?)\[/email\]#',
- '#\[color=([a-zA-Z]*|\#?[0-9a-fA-F]{6})](.*?)\[/color\]#s');
-
-
- $replace = array('<strong>$1</strong>',
- '<em>$1</em>',
- '<span class="souligne">$1</span>',
- '<span class="barre">$1</span>',
- '<div align="center">$1</div>',
- '<big>$1</big>',
- // 'truncate_url(\'$1\')',
- //'truncate_url(\'$1\', \'$2\')',
- '<a href="mailto:$1">$1</a>',
- '<a href="mailto:$1">$2</a>',
- '<span style="color: $1">$2</span>');
-
- // This thing takes a while! :)
- $string = preg_replace($pattern, $replace, $string);
-
-
-
- $string=clicurl($string);
-
- $string=autop($string);
-
-
- // If we split up the message before we have to concatenate it together again (code tags)
- if (isset($inside))
- {
- $outside = explode('<">', $string);
- $string = '';
-
- $num_tokens = count($outside);
-
- for ($i = 0; $i < $num_tokens; ++$i)
- {
- $string .= $outside[$i];
- if (isset($inside[$i]))
- $string .= '<br><br><table class="code" align="center" cellspacing="4" cellpadding="6"><tr><td class="punquote"><b>Code:</b><br><br><pre>'.trim($inside[$i]).'</pre></td></tr></table><br>';
- }
- }
-
-
-
-
-
-
- return $string;
-}
-
-function showTreeListSelect($table,$current, $parentID=0,$bur=0, $categoryname="")
-{
- /*
- arguments de showTreeListSelect
- - table:la table dans laquelle on execute la reqête
- - current
- - parentID
- - bur: si il vaut 0 on affiche seulement les étages, sinon on affiche les bureaux
- */
-
- $query = "select * from $table where (parentID = $parentID) order by name ";
-
-
-
- $db=new DB;
- //renvoie les etages et les bureaux
- if($bur==0){
- if ($result=$db->query($query)){
- if ($db->numrows($result)>0){
-
-
- while ($row=$db->fetch_array($result)){
-
- $ID = $row["ID"];
- $name = $categoryname . $row["name"];
- echo "<option value='$ID'";
- if($current == $ID)
- {
- echo " selected";
- }
- echo ">$name</option>\n";
- $name = $name . "\\";
- $bur=1;
- showTreeListSelect($table,$current, $ID,$bur,$name);
- }
- } }
- }
-
- //renvoie seulement les bureaux
- else{
- if ($result=$db->query($query)){
- if ($db->numrows($result)>0){
-
-
- while ($row=$db->fetch_array($result)){
- //print_r($row);
-
- $ID = $row["ID"];
- $name = $categoryname . $row["name"];
- if(strchr($name,"\\"))
- {
- echo "<option value='$ID'";
-
- if($current == $ID)
- {
- echo " selected";
-
- }
- echo ">$name</option>\n";
- }
- $name = $name . "\\";
-
- showTreeListSelect($table,$current, $ID,$bur,$name);
-
-
- }
- } }
-}
-}
-
-
-function getTreeLeafValueName($table,$ID)
-{
- $query = "select * from $table where (ID = $ID)";
- $db=new DB;
- $name="";
- if ($result=$db->query($query)){
- if ($db->numrows($result)==1){
- $name=$db->result($result,0,"name");
- }
-
- }
-return $name;
-}
-
-function getTreeValueName($table,$ID, $wholename="")
-{
- // show name catégory
- // ok ??
-
- global $lang;
-
- $query = "select * from $table where (ID = $ID)";
- $db=new DB;
-
- if ($result=$db->query($query)){
- if ($db->numrows($result)>0){
-
- $row=$db->fetch_array($result);
-
- $parentID = $row["parentID"];
- if($wholename == "")
- {
- $name = $row["name"];
- } else
- {
- $name = $row["name"] . "\\";
- }
- $name = getTreeValueName($table,$parentID, $name) . $name;
- }
-
- }
-return (@$name);
-}
-
-function showCalendarForm($form,$element,$value='',$withtemplate=''){
- global $HTMLRel,$lang;
- echo "<input type='text' name='$element' readonly size='10' value='$value'>";
-
- if ($withtemplate!=2){
- echo " <img src='".$HTMLRel."pics/calendar.png' class='calendrier' alt='".$lang["buttons"][15]."' title='".$lang["buttons"][15]."'
- onclick=\"window.open('$HTMLRel/mycalendar.php?form=$form&elem=$element&value=$value','".$lang["buttons"][15]."','width=200,height=220')\" >";
-
- echo " <img src='".$HTMLRel."pics/reset.png' class='calendrier' onClick=\"document.forms['$form'].$element.value='0000-00-00'\" alt='Reset' title='Reset'>";
- }
-}
-
-?>
diff -Nur web/glpi/glpi/glpi/common/.#functions.php.1.166 glpi/glpi/common/.#functions.php.1.166
--- web/glpi/glpi/glpi/common/.#functions.php.1.166 2005-03-04 12:04:02.000000000 +0100
+++ glpi/glpi/common/.#functions.php.1.166 1970-01-01 01:00:00.000000000 +0100
@@ -1,2347 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
-*/
-
-// Based on:
-// IRMA, Information Resource-Management and Administration
-// Christian Bauer
-// ----------------------------------------------------------------------
-// Original Author of file:
-// Purpose of file:
-// ----------------------------------------------------------------------
-
-function can_assign_job($name)
-{
- $db = new DB;
- $query = "SELECT * FROM glpi_users WHERE (name = '".$name."')";
- $result = $db->query($query);
- if (!$result&&$db->numrows()==0) return false;
- $type = $db->result($result, 0, "can_assign_job");
- if ($type == 'yes')
- {
- return true;
- }
- else
- {
- return false;
- }
-}
-
-function isPostOnly($authtype) {
- switch ($authtype){
- case "post-only" :
- case "normal" :
- case "admin":
- case "super-admin":
- return true;
- break;
- default :
- return false;
- }
-}
-
-function isNormal($authtype) {
- switch ($authtype){
- case "normal" :
- case "admin":
- case "super-admin":
- return true;
- break;
- default :
- return false;
- }
-}
-
-
-function isAdmin($authtype) {
- switch ($authtype){
- case "admin":
- case "super-admin":
- return true;
- break;
- default :
- return false;
- }
-}
-
-function isSuperAdmin($authtype) {
- switch ($authtype){
- case "super-admin":
- return true;
- break;
- default :
- return false;
- }
-}
-function searchUserbyType($authtype) {
- switch ($authtype){
- case "post-only" :
- return " 1=1 ";
- break;
- case "normal" :
- return " type ='super-admin' || type ='admin' || type ='normal'";
- break;
- case "admin":
- return " type ='super-admin' || type ='admin' ";
- break;
- case "super-admin":
- return " type ='super-admin' ";
- break;
- default :
- return "";
- }
-}
-
-function getDictEntryfromDB($s){
-GLOBAL $lang;
-$a=split("_",$s);
-return $lang[$a[0]][$a[1]];
-}
-
- function stripslashes_deep($value)
- {
-//echo "strip";
- $value = is_array($value) ?
- array_map('stripslashes_deep', $value) :
- (is_null($value) ? NULL : stripslashes($value));
-
- return $value;
- }
- function addslashes_deep($value)
- {
-//echo "add";
- $value = is_array($value) ?
- array_map('addslashes_deep', $value) :
- (is_null($value) ? NULL : addslashes($value));
- return $value;
- }
-
- function htmlentities_deep($value)
- {
-//echo "add";
- $value = is_array($value) ?
- array_map('htmlentities_deep', $value) :
- (is_null($value) ? NULL : htmlentities($value,ENT_QUOTES));
- return $value;
- }
- // Nécessaire pour PHP < 4.3
- function unhtmlentities ($string)
- {
- $trans_tbl = get_html_translation_table (HTML_ENTITIES,ENT_QUOTES);
- if( $trans_tbl["'"] != ''' ) { # some versions of PHP match single quotes to '
- $trans_tbl["'"] = ''';
- }
- $trans_tbl = array_flip ($trans_tbl);
- return strtr ($string, $trans_tbl);
- }
- function unhtmlentities_deep($value)
- {
- $value = is_array($value) ?
- array_map('unhtmlentities_deep', $value) :
- (is_null($value) ? NULL : unhtmlentities($value,ENT_QUOTES));
- return $value;
- }
-
-function checkAuthentication($authtype) {
- // Universal method to have a magic-quote-gpc system
- global $_POST, $_GET,$_COOKIE,$tab;
- // Clean array and addslashes
-
-if (get_magic_quotes_gpc()) {
- if (isset($_POST)){
- $_POST = array_map('stripslashes_deep', $_POST);
- }
- if (isset($_GET)){
- $_GET = array_map('stripslashes_deep', $_GET);
- }
-/* if (isset($_COOKIE)){
- $_COOKIE = array_map('stripslashes_deep', $_COOKIE);
- $_COOKIE = array_map('addslashes_deep', $_COOKIE);
- }
-*/ if (isset($tab)){
- $tab = array_map('stripslashes_deep', $tab);
- }
-}
-
- if (isset($_POST)){
- $_POST = array_map('addslashes_deep', $_POST);
- }
- if (isset($_GET)){
- $_GET = array_map('addslashes_deep', $_GET);
- }
-/* if (isset($_COOKIE)){
- $_COOKIE = array_map('addslashes_deep', $_COOKIE);
- }
-*/ if (isset($tab)){
- $tab = array_map('addslashes_deep', $tab);
- }
-
- // Checks a GLOBAL user and password against the database
- // If $authtype is "normal" or "admin", it checks if the user
- // has the privileges to do something. Should be used in every
- // control-page to set a minium security level.
- if(!isset($_SESSION)) session_start();
-
- GLOBAL $cfg_install, $lang, $HTMLRel;
-
- if(empty($_SESSION["authorisation"]))
- {
- nullHeader("Login",$_SERVER["PHP_SELF"]);
- echo "<div align='center'><b><a href=\"".$cfg_install["root"]."/logout.php\">Relogin</a></b></div>";
- nullFooter();
- die();
- }
-
-
- // New database object
-// print_r($_SESSION);
- loadLanguage();
- $type = $_SESSION["glpitype"];
-
- // Check username and password
- if (!isset($_SESSION["glpiname"])) {
- header("Vary: User-Agent");
- nullHeader($lang["login"][3], $_SERVER["PHP_SELF"]);
- echo "<center><b>".$lang["login"][0]."</b><br><br>";
- echo "<b><a href=\"".$cfg_install["root"]."/logout.php\">".$lang["login"][1]."</a></b></center>";
- nullFooter();
- exit();
- } else {
- header("Vary: User-Agent");
-
- loadLanguage();
-
- switch ($authtype) {
- case "super-admin";
- if (!isSuperAdmin($type))
- {
- commonHeader($lang["login"][5],$_SERVER["PHP_SELF"]);
- echo "<center><br><br><img src=\"".$HTMLRel."pics/warning.png\" alt=\"warning\"><br><br>";
- echo "<b>".$lang["login"][5]."</b></center>";
- commonFooter();
- exit();
- }
- break;
-
- case "admin";
- if (!isAdmin($type))
- {
- commonHeader($lang["login"][5],$_SERVER["PHP_SELF"]);
- echo "<center><br><br><img src=\"".$HTMLRel."pics/warning.png\" alt=\"warning\"><br><br>";
-
- echo "<b>".$lang["login"][5]."</b></center>";
- commonFooter();
- exit();
- }
- break;
-
- case "normal";
- if (!isNormal($type))
- {
- commonHeader($lang["login"][5],$_SERVER["PHP_SELF"]);
- echo "<center><br><br><img src=\"".$HTMLRel."pics/warning.png\" alt=\"warning\"><br><br>";
-
- echo "<b>".$lang["login"][5]."</b></center>";
- commonFooter();
- exit();
- }
- break;
-
- case "post-only";
- if (!isPostOnly($type))
- {
- commonHeader($lang["login"][5],$_SERVER["PHP_SELF"]);
- echo "<center><br><br><img src=\"".$HTMLRel."pics/warning.png\" alt=\"warning\"><br><br>";
-
- echo "<b>".$lang["login"][5]."</b></center>";
- commonFooter();
- exit();
- }
- break;
- }
- }
-}
-
-function commonHeader($title,$url)
-{
- // Print a nice HTML-head for every page
-
- GLOBAL $cfg_install,$lang, $cfg_layout,$cfg_features,$HTMLRel,$phproot ;
-
-
-$utils = array($lang["Menu"][17]=>array("/reservation/index.php","1"),
- $lang["Menu"][19]=>array("/knowbase/index.php"," "),
- $lang["Menu"][6]=>array("/reports/index.php"," "),
- );
-
-$inventory = array($lang["Menu"][0]=>array("/computers/index.php","1"),
- $lang["Menu"][1]=>array("/networking/index.php","2"),
- $lang["Menu"][2]=>array("/printers/index.php","3"),
- $lang["Menu"][3]=>array("/monitors/index.php","4"),
- $lang["Menu"][4]=>array("/software/index.php","5"),
- $lang["Menu"][16]=>array("/peripherals/index.php","6"),
- $lang["Menu"][21]=>array("/cartridges/index.php","7"),
- " "=>array("/central.php","8"),
- );
-
-$financial = array($lang["Menu"][22]=>array("/contacts/index.php","1"),
- $lang["Menu"][23]=>array("/enterprises/index.php"," "),
- $lang["Menu"][25]=>array("/contracts/index.php"," "),
- );
-
-$maintain = array($lang["Menu"][5]=>array("/tracking/index.php","6"),
- "Helpdesk"=>array("/helpdesk/index.php"," "),
- $lang["Menu"][13]=>array("/stats/index.php"," "));
-
-
-$config = array($lang["Menu"][14]=>array("/setup/setup-users.php"," "),
- $lang["Menu"][10]=>array("/setup/index.php"," "),
- $lang["Menu"][11]=>array("/preferences/index.php"," "),
- $lang["Menu"][12]=>array("/backups/index.php"," "));
-
- // Send extra expires header if configured
- if ($cfg_features["sendexpire"]) {
- header("Expires: Fri, Jun 12 1981 08:20:00 GMT\nPragma: no-cache");
- }
-
- // Start the page
- echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\";>";
- echo "<html><head><title>GLPI - ".$title."</title>";
- echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1 \" >";
-
- // Send extra expires header if configured
- if ($cfg_features["sendexpire"]) {
- echo "<meta http-equiv=\"Expires\" content=\"Fri, Jun 12 1981 08:20:00 GMT\">\n";
- echo "<meta http-equiv=\"Pragma\" content=\"no-cache\">\n";
- echo "<meta http-equiv=\"Cache-Control\" content=\"no-cache\">\n";
- }
-
- // Appel CSS
-
- echo "<link rel='stylesheet' href='".$HTMLRel."styles.css' type='text/css' media='screen' >";
- echo "<link rel='stylesheet' type='text/css' media='print' href='".$HTMLRel."print.css' >";
- echo "<link rel='shortcut icon' type='images/x-icon' href='".$HTMLRel."pics/favicon.ico' >";
-
- // Some Javascript-Functions which we may need later
-
- echo "<script type=\"text/javascript\" src='".$HTMLRel."script.js'></script>";
-
-
-
-
-
- // End of Head
- echo "</head>\n";
-
- // Body with configured stuff
- echo "<body>";
-
- // Main Headline
- echo "<div id='navigation'>";
- echo "<table cellspacing='0' border='0' width='100%'>";
- echo "<tr>";
-
- // New object from the configured base functions, we check some
- // object-variables in this object: inventory, maintain, admin
- // and settings. We build the navigation bar here.
-
- $navigation = new baseFunctions;
-
-
- // Logo with link to command center
- echo "<td width='80px' valign='middle' align='center' >\n";
- echo "<a class='icon_logo' href=\"".$cfg_install["root"]."/central.php\" accesskey=\"0\"><img src=\"".$HTMLRel."pics/logo-glpi.png\" alt=\"".$cfg_layout["logotxt"]."\" title=\"".$lang["central"][5]."\"></a>";
- echo "<br><br><div style='width:80px; text-align:center;'><p class='nav_horl'><b>".$_SESSION["glpiname"]."</b></p></div>";
- echo "</td>";
-
- echo "<td valign='middle' style='padding-left:20px'>";
-
-
- // Get object-variables and build the navigation-elements
- echo "<table width='100%' cellspacing='0' cellpadding='0' border='0'><tr>";
-
-
- if ($navigation->inventory) {
- echo "<td align='center' valign='top' width='20%'>";
- echo "<img class='icon_nav' src=\"".$HTMLRel."pics/inventaire.png\" alt=\"\" title=\"".$lang["setup"][10]."\"><br>";
- echo "<span class='menu_title'>- ".$lang["setup"][10]." -</span><br>";
-
- echo "<table cellspacing='0' border='0' cellpadding='0'><tr><td>";
- $i=0;
- foreach ($inventory as $key => $val) {
- if ($i%2==1) echo "</td><td style='border-left:1px groove #000000; border-right:1px groove #000000'> </td><td style='padding-left:5px; padding-right:5px;' align='center'>";
- else echo "</td></tr><tr><td style='padding-left:5px; padding-right:5px;' align='center'>";
-
- echo "<span class='menu'><a href=\"".$cfg_install["root"].$val[0]."\" accesskey=\"".$val[1]."\">".$key."</a></span><br>";
- $i++;
- }
- echo "</td></tr></table>";
- echo "</td>";
- }
-
-
- if ($navigation->maintain) {
- echo "<td align='center' valign='top' width='20%'>";
- echo "<img class='icon_nav' src=\"".$HTMLRel."pics/maintenance.png\" alt=\"\" title=\"".$lang["title"][24]."\"><br>";
-
- echo "<span class='menu_title'>- ".$lang["title"][24]." -</span><br>";
- foreach ($maintain as $key => $val) {
- echo "<span class='menu'><a href=\"".$cfg_install["root"].$val[0]."\" accesskey=\"".$val[1]."\">".$key."</a></span><br>";
- }
- echo "</td>";
- }
-
- if ($navigation->financial) {
- echo "<td align='center' valign='top' width='20%'>";
- echo "<img class='icon_nav' src=\"".$HTMLRel."pics/gestion.png\" alt=\"\" title=\"".$lang["setup"][55]."\"><br>";
-
- echo "<span class='menu_title'>- ".$lang["Menu"][26]." -</span><br>";
- foreach ($financial as $key => $val) {
- echo "<span class='menu'><a href=\"".$cfg_install["root"].$val[0]."\" accesskey=\"".$val[1]."\">".$key."</a></span><br>";
- }
- echo "</td>";
- }
-
-
- if ($navigation->utils) {
- echo "<td align='center' valign='top' width='20%'>";
- echo "<img class='icon_nav' src=\"".$HTMLRel."pics/outils.png\" alt=\"\" title=\"".$lang["Menu"][15]."\"><br>";
-
- echo "<span class='menu_title'>- ".$lang["Menu"][18]." -</span><br>";
- foreach ($utils as $key => $val) {
- echo "<span class='menu'><a href=\"".$cfg_install["root"].$val[0]."\" accesskey=\"".$val[1]."\">".$key."</a></span><br>";
- }
- }
-
-
- if ($navigation->settings) {
- echo "<td align='center' valign='top' width='20%'>";
- echo "<img class='icon_nav' src=\"".$HTMLRel."pics/config.png\" alt=\"\" title=\"".$lang["Menu"][15]."\"><br>";
-
- echo "<span class='menu_title'>- ".$lang["Menu"][15]." -</span><br>";
- foreach ($config as $key => $val) {
- echo "<span class='menu'><a href=\"".$cfg_install["root"].$val[0]."\" accesskey=\"".$val[1]."\">".$key."</a></span><br>";
- }
- echo "</td>";
- }
-
-
-
-
- // On the right side of the navigation bar, we have a clock with
- // date, help and a logout-link.
-
- echo "<td align='center' valign='top' width='100px'>";
- //help
- echo "<a class='icon_nav_move' href='#' onClick=\"window.open('".$HTMLRel."help/".$cfg_install["languages"][$_SESSION["glpilanguage"]][2]."','helpdesk','width=700,height=600,scrollbars=yes')\"><img class='icon_nav' src=\"".$HTMLRel."pics/help.png\" alt=\"\" title=\"".$lang["central"][7]."\"></a>";
- echo "<p>".date("H").":".date("i")."<br><i>".date("j.")." ".date("M")." ".date("Y");
- echo "</i></p>";
- echo "<a class='icon_nav_move' href=\"".$cfg_install["root"]."/logout.php\"><img src=\"".$HTMLRel."pics/logout.png\" alt=\"".$lang["central"][6]."\" title=\"".$lang["central"][6]."\"></a>";
-
- echo "</td>";
-
- // End navigation bar
-
- echo "</tr></table>";
-
- // End headline
-
-
- echo "</td></tr>";
-echo "</table>\n";
- echo "</div>";
-// Affichage du message apres redirection
-if (isset($_SESSION["MESSAGE_AFTER_REDIRECT"])&&!empty($_SESSION["MESSAGE_AFTER_REDIRECT"])){
-echo "<center><b>".$_SESSION["MESSAGE_AFTER_REDIRECT"]."</b></center>";
-unset($_SESSION["MESSAGE_AFTER_REDIRECT"]);
-}
-}
-
-
-function helpHeader($title,$url,$name) {
- // Print a nice HTML-head for help page
-
- GLOBAL $cfg_layout,$cfg_install,$lang,$cfg_features,$HTMLRel,$phproot ;
-
- // Send extra expires header if configured
- if ($cfg_features["sendexpire"]) {
- header("Expires: Fri, Jun 12 1981 08:20:00 GMT\nPragma: no-cache");
- }
-
- // Start the page
- echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\";>";
- echo "<html><head><title>GLPI Helpdesk - ".$title."</title>";
- echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1 \" >";
- echo "<link rel='shortcut icon' type='images/x-icon' href='".$HTMLRel."pics/favicon.ico' />";
- // Send extra expires header if configured
- if ($cfg_features["sendexpire"]) {
- echo "<meta http-equiv=\"Expires\" content=\"Fri, Jun 12 1981 08:20:00 GMT\">\n";
- echo "<meta http-equiv=\"Pragma\" content=\"no-cache\">\n";
- echo "<meta http-equiv=\"Cache-Control\" content=\"no-cache\">\n";
- }
-
- // Some Javascript-Functions which we may need later
-
- echo "<script type=\"text/javascript\" src='".$HTMLRel."script.js'></script>";
-
- // Appel CSS
-
- echo "<link rel='stylesheet' href='".$HTMLRel."styles.css' type='text/css' media='screen' >";
- echo "<link rel='stylesheet' type='text/css' media='print' href='".$HTMLRel."print.css' >";
-
- // End of Head
- echo "</head>\n";
-
- // Body with configured stuff
- echo "<body>";
-
- // Main Headline
- echo "<div id='navigation'>";
-
- echo "<table cellspacing='0' border='0' width='98%'>";
- echo "<tr>";
-
- // Logo with link to command center
- echo "<td align='center' width='25%'>\n";
-
- echo "<img src=\"".$HTMLRel."pics/logo-glpi.png\" alt=\"".$cfg_layout["logotxt"]."\" title=\"".$lang["central"][5]."\" >";
- echo "<div style='width:80px; text-align:center;'><p class='nav_horl'><b>".$_SESSION["glpiname"]."</b></p></div>";
- echo "</td>";
-
- echo "<td valign='middle'>";
-
- echo "<table width='100%' cellspacing='0' cellpadding='0' border='0'><tr>";
-
- if (ereg("tracking-injector",$_SERVER["PHP_SELF"]))
- echo "<td width='100%'> </td>";
- // Just give him a language selector
- echo "<td>";
- if (!ereg("tracking-injector",$_SERVER["PHP_SELF"]))
- showLangSelect($cfg_install["root"]."/preferences/index.php",$name);
- else echo " ";
- echo "</td>";
-
- // And he can change his password, thats it
- echo "<td>";
- if ($_SESSION["extauth"]!=1&&!ereg("tracking-injector",$_SERVER["PHP_SELF"]))
- showPasswordForm($cfg_install["root"]."/preferences/index.php",$name);
- else echo " ";
- echo "</td>";
- // We tracking or post a new one
- echo "<td>";
- echo "<a class='icon_nav_move' href=\"".$cfg_install["root"]."/helpdesk.php\"><img src=\"".$HTMLRel."pics/ajoutinterv.png\" alt=\"".$lang["job"][13]."\" title=\"".$lang["job"][13]."\"></a><br><br>";
- echo "<a class='icon_nav_move' href=\"".$cfg_install["root"]."/helpdesk.php?show=user\"><img src=\"".$HTMLRel."pics/suivi.png\" alt=\"".$lang["tracking"][0]."\" title=\"".$lang["tracking"][0]."\"></a>";
- echo "</td>";
- //reservation
-
- echo "<td>";
- echo "<a class='icon_nav_move' href=\"".$cfg_install["root"]."/helpdesk.php?show=resa\"><img src=\"".$HTMLRel."pics/reservation-2.png\" alt=\"".$lang["Menu"][17]."\" title=\"".$lang["Menu"][17]."\"></a><br><br>";
- echo "<a class='icon_nav_move' href=\"".$cfg_install["root"]."/helpdesk.php?show=faq\"><img src=\"".$HTMLRel."pics/faq-24.png\" alt=\"".$lang["knowbase"][1]."\" title=\"".$lang["knowbase"][1]."\"></a>";
-
- echo "</td>";
- // On the right side of the navigation bar, we have a clock with
- // date, help and a logout-link.
- echo "<td align='right' width='100'><div align='right'>";
- // HELP
- echo "<a class='icon_nav_move' href='#' onClick=\"window.open('".$HTMLRel."help/".$cfg_install["languages"][$_SESSION["glpilanguage"]][1]."','helpdesk','width=400,height=600,scrollbars=yes')\"><img class='icon_nav' src=\"".$HTMLRel."pics/help.png\" alt=\"\" title=\"".$lang["central"][7]."\"></a><br><br>";
-
- echo date("H").":".date("i")."<p><i>".date("j.")." ".date("M")." ".date("Y");
- echo "</i></p><a class='icon_nav_move' href=\"".$cfg_install["root"]."/logout.php\"><img class='icon_nav' src=\"".$HTMLRel."pics/logout.png\" alt=\"".$lang["central"][6]."\" title=\"".$lang["central"][6]."\"></a></div></td>";
-
- // End navigation bar
-
- echo "</tr></table>";
-
- // End headline
-
- echo "</td></tr>";
- echo "</table>\n";
- echo "</div>";
-}
-
-function nullHeader($title,$url) {
- // Print a nice HTML-head with no controls
-
- GLOBAL $cfg_layout,$cfg_install,$lang,$HTMLRel,$phproot ;
-
- // Send extra expires header if configured
- if (!empty($cfg_features["sendexpire"])) {
- header("Expires: Fri, Jun 12 1981 08:20:00 GMT\nPragma: no-cache");
- }
-
- // Start the page
- echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\";>";
- echo "<html><head><title>GLPI - ".$title."</title>";
- echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1 \" >";
- echo "<link rel='shortcut icon' type='images/x-icon' href='".$HTMLRel."pics/favicon.ico' />";
- // Send extra expires header if configured
- if (!empty($cft_features["sendexpire"])) {
- echo "<meta http-equiv=\"Expires\" content=\"Fri, Jun 12 1981 08:20:00 GMT\">\n";
- echo "<meta http-equiv=\"Pragma\" content=\"no-cache\">\n";
- echo "<meta http-equiv=\"Cache-Control\" content=\"no-cache\">\n";
- }
-
- // Some Javascript-Functions which we may need later
-
- echo "<script type=\"text/javascript\" src='".$HTMLRel."script.js'></script>";
-
- // Appel CSS
-
- echo "<link rel='stylesheet' href='".$HTMLRel."styles.css' type='text/css' media='screen' >";
-
-
- // End of Head
- echo "</head>\n";
-
- // Body with configured stuff
- echo "<body>";
-
- // Main Headline
- echo "<div id='navigation'>";
-
- echo "<table cellspacing='0' border='0' width='98%'>";
- echo "<tr>";
-
- // Logo with link to index
- echo "<td align='center' width='100%'>\n";
- echo "<a href=\"".$cfg_install["root"]."/index.php\"><img src=\"".$HTMLRel."pics/logo-glpi.png\" alt=\"".$cfg_layout["logotxt"]."\" title=\"\" ></a>\n";
- echo "</td>";
-
-
- // End navigation bar
-
- echo "</tr></table>";
-
- // End headline
-
- echo "</td></tr></form>";
- echo "</table>\n";
- echo "</div>";
-}
-
-
-function commonFooter() {
- // Print foot for every page
-
-GLOBAL $cfg_install;
-echo "<div id='footer'><div align='right'>";
- echo "<a href=\"http://GLPI.indepnet.org/\";>";
- echo "<span class='copyright'>GLPI ".$cfg_install["version"]." Copyright (C) 2003-2005 by the INDEPNET Development Team.</span>";
- echo "</a></div>";
- echo "</div>";
- echo "</body></html>";
-}
-
-function helpFooter() {
- // Print foot for help page
-GLOBAL $cfg_install;
-echo "<div id='footer'><div align='right'>";
- echo "<a href=\"http://GLPI.indepnet.org/\";>";
- echo "<span class='copyright'>GLPI ".$cfg_install["version"]." Copyright (C) 2003-2005 by the INDEPNET Development Team.</span>";
- echo "</a></div>";
- echo "</div>";
-
- echo "</body></html>";
-}
-
-function nullFooter() {
- // Print foot for help page
-GLOBAL $cfg_install;
-echo "<div id='footer'><div align='right'>";
- echo "<a href=\"http://GLPI.indepnet.org/\";>";
- echo "<span class='copyright'>GLPI ".$cfg_install["version"]." Copyright (C) 2003-2005 by the INDEPNET Development Team.</span>";
- echo "</a>";
- echo "</div></div>";
-
- echo "</body></html>";
-}
-
-function logEvent ($item, $itemtype, $level, $service, $event) {
- // Logs the event if level is above or equal to setting from configuration
-
- GLOBAL $cfg_features;
- if ($level <= $cfg_features["event_loglevel"]) {
- $db = new DB;
- $query = "INSERT INTO glpi_event_log VALUES (NULL, $item, '$itemtype', NOW(), '$service', $level, '$event')";
- $result = $db->query($query);
- }
-}
-
-
-function showEvents($target,$order,$sort) {
- // Show events from $result in table form
-
- GLOBAL $cfg_layout, $cfg_install, $cfg_features, $lang, $HTMLRel;
-
- // new database object
- $db = new DB;
-
- // define default sorting
-
- if (!$sort) {
- $sort = "date";
- $order = "DESC";
- }
-
- // Query Database
- $query = "SELECT * FROM glpi_event_log ORDER BY $sort $order LIMIT 0,".$cfg_features["num_of_events"];
-
- // Get results
- $result = $db->query($query);
-
-
- // Number of results
- $number = $db->numrows($result);
-
- // No Events in database
- if ($number < 1) {
- echo "<b>".$lang["central"][4]."</b>";
- return;
- }
-
- // Output events
- $i = 0;
-
- echo "<p><center><table width='90%' class='tab_cadre'>";
- echo "<tr><th colspan='6'>".$lang["central"][2]." ".$cfg_features["num_of_events"]." ".$lang["central"][3].":</th></tr>";
- echo "<tr>";
-
- echo "<th colspan='2'>";
- if ($sort=="item") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?sort=item&order=ASC\">".$lang["event"][0]."</a></th>";
-
- echo "<th>";
- if ($sort=="date") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?sort=date&order=DESC\">".$lang["event"][1]."</a></th>";
-
- echo "<th width='8%'>";
- if ($sort=="service") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?sort=service&order=ASC\">".$lang["event"][2]."</a></th>";
-
- echo "<th width='8%'>";
- if ($sort=="level") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?sort=level&order=DESC\">".$lang["event"][3]."</a></th>";
-
- echo "<th width='60%'>";
- if ($sort=="message") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?sort=message&order=ASC\">".$lang["event"][4]."</a></th></tr>";
-
- while ($i < $number) {
- $ID = $db->result($result, $i, "ID");
- $item = $db->result($result, $i, "item");
- $itemtype = $db->result($result, $i, "itemtype");
- $date = $db->result($result, $i, "date");
- $service = $db->result($result, $i, "service");
- $level = $db->result($result, $i, "level");
- $message = $db->result($result, $i, "message");
-
- echo "<tr class='tab_bg_2'>";
- echo "<td>$itemtype:</td><td align='center'><b>";
- if ($item=="-1" || $item=="0") {
- echo $item;
- } else {
- if ($itemtype=="reservation"){
- echo "<a href=\"".$cfg_install["root"]."/$itemtype/index.php?show=resa&ID=";
- } else {
- echo "<a href=\"".$cfg_install["root"]."/$itemtype/".$itemtype."-info-form.php?ID=";
- }
- echo $item;
- echo "\">$item</a>";
- }
- echo "</b></td><td>$date</td><td align='center'>$service</td><td align='center'>$level</td><td>$message</td>";
- echo "</tr>";
-
- $i++;
- }
-
- echo "</table></center><br>";
-}
-
-
-
-function dropdown($table,$myname) {
-
- global $deleted_tables;
-
- // Make a select box
- $db = new DB;
- if($table == "glpi_dropdown_locations" || $table == "glpi_dropdown_kbcategories") {
- echo "<select name=\"$myname\">";
- showTreeListSelect($table,-1, 0);
- echo "</select>";
- }
- else if($table == "glpi_dropdown_netpoint") {
- $query = "select t1.ID as ID, t1.name as netpname, t2.name as locname from glpi_dropdown_netpoint as t1";
- $query .= " left join glpi_dropdown_locations as t2 on t1.location = t2.ID";
- $query .= " order by t2.name, t1.name";
- $result = $db->query($query);
- echo "<select name=\"$myname\">";
- $i = 0;
- $number = $db->numrows($result);
- if ($number > 0) {
- while ($i < $number) {
- $output = $db->result($result, $i, "netpname");
- $loc = $db->result($result, $i, "locname");
- $ID = $db->result($result, $i, "ID");
- echo "<option value=\"$ID\">$output ($loc)</option>";
- $i++;
- }
- }
- echo "</select>";
- }
- else {
- $where="";
- if (in_array($table,$deleted_tables))
- $where="WHERE deleted='N'";
-
- $query = "SELECT * FROM $table $where ORDER BY name";
- $result = $db->query($query);
- echo "<select name=\"$myname\" size='1'>";
- $i = 0;
- $number = $db->numrows($result);
- if ($number > 0) {
- while ($i < $number) {
- $output = $db->result($result, $i, "name");
- $ID = $db->result($result, $i, "ID");
- echo "<option value=\"$ID\">$output</option>";
- $i++;
- }
- }
- echo "</select>";
- }
-}
- /*!
- \brief remplie la dropdown avec la colonne d'une table passée en argument
-*/
-
-/*
-function dropdownValue($table,$myname,$value,$bur=0) {
-
- global $deleted_tables;
-
- // Make a select box with preselected values
- $db = new DB;
- if ($table == "glpi_dropdown_locations" || $table=="glpi_dropdown_kbcategories"){
- echo "<select name=\"$myname\">";
- echo "<option value=\"0\">-----</option>";
- showTreeListSelect($table,$value, 0,$bur);
- echo "</select>";
- }
- else if($table == "glpi_dropdown_netpoint") {
- $query = "select t1.ID as ID, t1.name as netpname, t2.ID as locID from glpi_dropdown_netpoint as t1";
- $query .= " left join glpi_dropdown_locations as t2 on t1.location = t2.ID";
- $query .= " order by t1.name,t2.name ";
- $result = $db->query($query);
- echo "<select name=\"$myname\">";
- $i = 0;
- $number = $db->numrows($result);
- if ($number > 0) {
- while ($i < $number) {
- $output = $db->result($result, $i, "netpname");
- $loc = getTreeValueName("glpi_dropdown_locations",$db->result($result, $i, "locID"));
- $ID = $db->result($result, $i, "ID");
- echo "<option value=\"$ID\"";
- if ($ID==$value) echo " selected ";
- echo ">$output ($loc)</option>";
- $i++;
- }
- }
- echo "</select>";
- }
-
- else {
-
- $where="";
- if (in_array($table,$deleted_tables))
- $where="WHERE deleted='N'";
-
- $query = "SELECT * FROM $table $where ORDER BY name";
- $result = $db->query($query);
-
- echo "<select name=\"$myname\" size='1'>";
- echo "<option value=\"0\">-----</option>";
- $i = 0;
- $number = $db->numrows($result);
- if ($number > 0) {
- while ($i < $number) {
- $output = $db->result($result, $i, "name");
- $ID = $db->result($result, $i, "ID");
- if ($ID === $value) {
- echo "<option value=\"$ID\" selected>$output</option>";
-
- } else {
- echo "<option value=\"$ID\">$output</option>";
- }
- $i++;
- }
- }
- echo "</select>";
-
- if ($table=="glpi_enterprises") {
- echo getEnterpriseLinks($value);
- }
-
- }
-}
-*/
-function dropdownValue($table,$myname,$value,$bur=0) {
-
- global $deleted_tables;
-
- // Make a select box with preselected values
- $db = new DB;
- if ($table == "glpi_dropdown_locations" || $table=="glpi_dropdown_kbcategories"){
- echo "<select name=\"$myname\">";
- echo "<option value=\"0\">-----</option>";
- showTreeListSelect($table,$value, 0,$bur);
- echo "</select>";
- }
- else if($table == "glpi_dropdown_netpoint") {
- $query = "select t1.ID as ID, t1.name as netpname, t2.ID as locID from glpi_dropdown_netpoint as t1";
- $query .= " left join glpi_dropdown_locations as t2 on t1.location = t2.ID";
- $query .= " order by t1.name,t2.name ";
- $result = $db->query($query);
- echo "<select name=\"$myname\">";
- $i = 0;
- $number = $db->numrows($result);
- if ($number > 0) {
- while ($i < $number) {
- $output = $db->result($result, $i, "netpname");
- $loc = getTreeValueName("glpi_dropdown_locations",$db->result($result, $i, "locID"));
- $ID = $db->result($result, $i, "ID");
- echo "<option value=\"$ID\"";
- if ($ID==$value) echo " selected ";
- echo ">$output ($loc)</option>";
- $i++;
- }
- }
- echo "</select>";
- }
-
- //permet d'afficher une dropdown avec les différents responsables technique avec le responsable en //question sélectionné
- else if($table=="glpi_contacts")
- {
-
- $query="SELECT * FROM glpi_contacts ORDER BY name";
- $query2="SELECT * FROM glpi_computers";
- $result = $db->query($query);
- $result2=$db->query($query);
- echo "<select name=\"$myname\" size='1'>";
- $i = 0;
- $number = $db->numrows($result);
- $test=$db->result($result2,$i,"tech_num");
- if ($number > 0) {
- while ($i < $number) {
- $output = $db->result($result, $i, "name");//colonne de la table qui sera affichée dans la dropown
- $ID = $db->result($result, $i, "ID");
- $tech=$db->result($result, $i,"type");
- if($test == 0)
- {
- echo "<option value=\"NULL\">-----</option>";
- $test+=1;
- }
- if($tech == 2){
- if ($ID === $value ) {
- echo "<option value=\"$ID\" selected>$output</option>";
-
- } else {
-
- echo "<option value=\"$ID\" >$output</option>";
- }
- }
- $i++;
-
- }
-
- }
- echo "</select>";
- }
-
-
-
- else {
-
- $where="";
- if (in_array($table,$deleted_tables))
- $where="WHERE deleted='N'";
-
- $query = "SELECT * FROM $table $where ORDER BY name";
- $result = $db->query($query);
-
- echo "<select name=\"$myname\" size='1'>";
- echo "<option value=\"0\">-----</option>";
- $i = 0;
- $number = $db->numrows($result);
- if ($number > 0) {
- while ($i < $number) {
- $output = $db->result($result, $i, "name");
- $ID = $db->result($result, $i, "ID");
- if ($ID === $value) {
- echo "<option value=\"$ID\" selected>$output</option>";
-
- } else {
- echo "<option value=\"$ID\">$output</option>";
- }
- $i++;
- }
- }
- echo "</select>";
-
- if ($table=="glpi_enterprises") {
- echo getEnterpriseLinks($value);
- }
-
- }
-}
-function dropdownNoValue($table,$myname,$value) {
- // Make a select box without parameters value
-
- global $deleted_tables;
-
- $db = new DB;
-
- $where="";
- if (in_array($table,$deleted_tables))
- $where="WHERE deleted='N'";
-
- $query = "SELECT * FROM $table $where ORDER BY name";
- $result = $db->query($query);
-
- echo "<select name=\"$myname\" size='1'>";
- $i = 0;
- $number = $db->numrows($result);
- if ($number > 0) {
- while ($i < $number) {
- $output = $db->result($result, $i, "name");
- $ID = $db->result($result, $i, "ID");
- if ($ID === $value) {
- } else {
- echo "<option value=\"$ID\">$output</option>";
- }
- $i++;
- }
- }
- echo "</select>";
-}
-
-function NetpointLocationSearch($search,$myname,$location,$value='') {
-// Make a select box with preselected values for table dropdown_netpoint
- $db = new DB;
-
- $query = "SELECT t1.ID as ID, t1.name as netpointname, t2.name as locname
- FROM glpi_dropdown_netpoint AS t1
- LEFT JOIN glpi_dropdown_locations AS t2
- ON t1.location = t2.ID
- WHERE (";
- if ($location!="")
- $query.= " t2.ID = '". $location ."' AND ";
- $query.=" (t2.name LIKE '%". $search ."%'
- OR t1.name LIKE '%". $search ."%'))";
- if ($value!="")
- $query.=" OR t1.ID = '$value' ";
- $query.=" ORDER BY t1.name, t2.name";
- $result = $db->query($query);
-
- if ($db->numrows($result) == 0) {
- $query = "SELECT t1.ID as ID, t1.name as netpointname, t2.name as locname, t2.ID as locID
- FROM glpi_dropdown_netpoint AS t1
- LEFT JOIN glpi_dropdown_locations AS t2 ON t1.location = t2.ID
- ORDER BY t1.name, t2.name";
- $result = $db->query($query);
- }
-
-
- echo "<select name=\"$myname\" size='1'>";
- echo "<option value=\"0\">---</option>";
-
- if($db->numrows($result) > 0) {
- while($line = $db->fetch_array($result)) {
- echo "<option value=\"". $line["ID"] ."\" ";
- if ($value==$line["ID"]) echo " selected ";
- echo ">". $line["netpointname"]." (".getTreeValueName("glpi_dropdown_locations",$line["locID"]) .")</option>";
- }
- }
- echo "</select>";
-}
-
-function dropdownValueSearch($table,$myname,$value,$search) {
- // Make a select box with preselected values
- if(is_string($search))
- {
- $db = new DB;
-
- $query = "SELECT * FROM $table WHERE name LIKE '%$search%' ORDER BY name";
- $result = $db->query($query);
-
-
- $number = $db->numrows($result);
- if ($number == 0) {
- $query = "SELECT * FROM $table ORDER BY name";
- $result = $db->query($query);
- $number = $db->numrows($result);
- }
-
- echo "<select name=\"$myname\" size='1'>";
-
- if ($number > 0) {
- $i = 0;
- while ($i < $number) {
- if ($table=="glpi_software")
- $output = $db->result($result, $i, "name")." ".$db->result($result, $i, "version");
- else
- $output = $db->result($result, $i, "name");
- $ID = $db->result($result, $i, "ID");
-
- if ($ID == $value) {
- echo "<option value=\"$ID\" selected>$output</option>";
- } else {
- echo "<option value=\"$ID\">$output</option>";
- }
- $i++;
- }
- }
- echo "</select>";
- }
- else
- {
- $db = new DB;
-
- $query = "SELECT * FROM $table WHERE Parentid LIKE '$search' ORDER BY name";
- $result = $db->query($query);
-
-
- $number = $db->numrows($result);
- if ($number == 0) {
- $query = "SELECT * FROM $table ORDER BY name";
- $result = $db->query($query);
- $number = $db->numrows($result);
- }
-
- echo "<select name=\"$myname\" size='1'>";
-
- if ($number > 0) {
- $i = 0;
- while ($i < $number) {
- if ($table=="glpi_software")
- $output = $db->result($result, $i, "name")." ".$db->result($result, $i, "version");
- else
- $output = $db->result($result, $i, "name");
- $ID = $db->result($result, $i, "ID");
-
- if ($ID == $value) {
- echo "<option value=\"$ID\" selected>$output</option>";
- } else {
- echo "<option value=\"$ID\">$output</option>";
- }
- $i++;
- }
- }
- echo "</select>";
- }
-}
-
-function dropdownUsers($value, $myname) {
- // Make a select box with all glpi users
-
- $db = new DB;
- $query = "SELECT * FROM glpi_users WHERE (".searchUserbyType("normal").") ORDER BY name";
- $result = $db->query($query);
-
- echo "<select name=\"$myname\">";
- $i = 0;
-
- $number = $db->numrows($result);
- echo "<option value=\"\">[ Nobody ]</option>";
- if ($number > 0) {
- while ($i < $number) {
- $output = unhtmlentities($db->result($result, $i, "name"));
- if ($output == $value) {
- echo "<option value=\"$output\" selected>".$output;
- } else {
- echo "<option value=\"$output\">".$output;
- }
- $i++;
- echo "</option>";
- }
- }
- echo "</select>";
-}
-
-
-function getDropdownName($table,$id) {
- global $cfg_install;
- $db = new DB;
- $name = "";
- $query = "select * from ". $table ." where ID = '". $id ."'";
- if ($result = $db->query($query))
- if($db->numrows($result) != 0) {
- if ($table=="glpi_dropdown_locations"||$table=="glpi_dropdown_kbcategories"){
- $name=getTreeValueName($table,$id);
-
- } else {
- $name = $db->result($result,0,"name");
- if ($table=="glpi_dropdown_netpoint")
- $name .= " (".getDropdownName("glpi_dropdown_locations",$db->result($result,0,"location")).")";
- }
- if ($table=="glpi_enterprises"){
- $name.=getEnterpriseLinks($id);
-
- }
- }
- return $name;
-}
-
-function dropdownUsersTracking($value, $myname,$champ) {
- // Make a select box with all glpi users in tracking table
- global $lang;
- $db = new DB;
- $query = "SELECT DISTINCT glpi_tracking.$champ AS NAME FROM glpi_tracking WHERE glpi_tracking.$champ <> '' ORDER BY glpi_tracking.$champ";
- $result = $db->query($query);
-
- echo "<select name=\"$myname\">";
- $i = 0;
- $number = $db->numrows($result);
- if ($number > 0) {
- echo "<option value=\"all\">".$lang["reports"][16]."\n";
- while ($i < $number) {
- $name = $db->result($result, $i, "NAME");
- if ($name == $value) {
- echo "<option value=\"$name\" selected>".$name;
- } else {
- echo "<option value=\"$name\">".$name;
- }
- $i++;
- echo "</option>";
- }
- }
- echo "</select>";
-}
-
-function dropdownAllItems($name,$search='',$value='') {
- $db=new DB;
-
- $items=array(
- COMPUTER_TYPE=>"glpi_computers",
- NETWORKING_TYPE=>"glpi_networking",
- PRINTER_TYPE=>"glpi_printers",
- MONITOR_TYPE=>"glpi_monitors",
- PERIPHERAL_TYPE=>"glpi_peripherals",
- SOFTWARE_TYPE=>"glpi_software",
- );
-
- echo "<select name=\"$name\" size='1'>";
-
- foreach ($items as $type => $table){
-
- $where="WHERE '1' = '1' ";
- if ($table=="glpi_computers")
- $where.="AND is_template='0' ";
-
- if (!empty($search))
- $where.="AND name LIKE '%$search%' ";
-
-// if ($table=="glpi_enterprises"||$table=="glpi_cartridge_type")
-// $where = "WHERE deleted='N' ";
-
- $query = "SELECT ID FROM $table $where ORDER BY name";
-
- $result = $db->query($query);
-
- $i = 0;
- $number = $db->numrows($result);
-
- if ($number > 0) {
- while ($i < $number) {
- $ID=$db->result($result, $i, "ID");
- $ci=new CommonItem;
- $ci->getFromDB($type,$ID);
- $output=$ci->getType()." - ".$ci->getName();
- if (createAllItemsSelectValue($type,$ID) === $value) {
- echo "<option value=\"".$type."_".$ID."\" selected>$output</option>";
- } else {
- echo "<option value=\"".$type."_".$ID."\">$output</option>";
- }
- $i++;
- }
- }
- }
- echo "</select>";
-
-}
-
-function createAllItemsSelectValue($type,$ID){
- return $type."_".$ID;
-}
-
-function explodeAllItemsSelectResult($val){
- $splitter=split("_",$val);
- return array($splitter[0],$splitter[1]);
-}
-
-
-function loadLanguage() {
-
- GLOBAL $lang,$cfg_install;
-
- if(empty($_SESSION["glpilanguage"]))
- {
- $file= "/glpi/dicts/".$cfg_install["languages"][$cfg_install["default_language"]][1];
- }
- else {
- //$file = "/glpi/dicts/".$_SESSION["glpilanguage"].".php";
-
- $file = "/glpi/dicts/".$cfg_install["languages"][$_SESSION["glpilanguage"]][1];
-
- }
- include ("_relpos.php");
- include ($phproot . $file);
-}
-
-
-function showConnect($target,$ID,$type) {
- // Prints a direct connection to a computer
-
- GLOBAL $lang, $cfg_layout, $cfg_install;
-
- $connect = new Connection;
- $connect->type=$type;
- $computer = $connect->getComputerContact($ID);
-
- echo "<br><center><table width='50%' class='tab_cadre'><tr><th colspan='2'>";
- echo $lang["connect"][0].":";
- echo "</th></tr>";
-
- if ($computer) {
- $connect->getComputerData($computer);
- echo "<tr><td class='tab_bg_1".($connect->deleted=='Y'?"_2":"")."'><b>Computer: ";
- echo "<a href=\"".$cfg_install["root"]."/computers/computers-info-form.php?ID=".$connect->device_ID."\">";
- echo $connect->device_name." (".$connect->device_ID.")";
- echo "</a>";
- echo "</b></td>";
- echo "<td class='tab_bg_2".($connect->deleted=='Y'?"_2":"")."' align='center'><b>";
- echo "<a href=\"$target?disconnect=1&ID=$ID\">".$lang["connect"][3]."</a>";
- } else {
- echo "<tr><td class='tab_bg_1'><b>Computer: </b>";
- echo "<i>".$lang["connect"][1]."</i>";
- echo "</td>";
- echo "<td class='tab_bg_2' align='center'><b>";
- echo "<a href=\"$target?connect=1&ID=$ID\">".$lang["connect"][2]."</a>";
- }
-
- echo "</b></td>";
- echo "</tr>";
- echo "</table></center><br>";
-}
-
-function Disconnect($ID,$type) {
- // Disconnects a direct connection
-
- $connect = new Connection;
- $connect->type=$type;
- $connect->deletefromDB($ID);
-}
-
-function Connect($target,$sID,$cID,$type) {
- global $lang;
- // Makes a direct connection
-
- $connect = new Connection;
- $connect->end1=$sID;
- $connect->end2=$cID;
- $connect->type=$type;
- $connect->addtoDB();
- // Mise a jour lieu du periph si nécessaire
- $dev=new CommonItem();
- $dev->getFromDB($type,$sID);
-
- $comp=new Computer();
- $comp->getFromDB($cID);
- if ($comp->fields['location']!=$dev->obj->fields['location']){
- $updates[0]="location";
- $dev->obj->fields['location']=$comp->fields['location'];
- $dev->obj->updateInDB($updates);
- $_SESSION["MESSAGE_AFTER_REDIRECT"]=$lang["computers"][48];
-
- }
-
-}
-
-function showConnectSearch($target,$ID,$type="computer") {
-
- GLOBAL $cfg_layout,$cfg_install, $lang;
-
- echo "<center><table class='tab_cadre'>";
- echo "<tr><th colspan='2'>".$lang["connect"][4]." :</th></tr>";
- echo "<tr class='tab_bg_1'>";
- echo "<form method='post' action=\"$target\">";
- echo "<td>";
- switch($type){
- case "computer" :
- echo $lang["connect"][5];
- break;
- case "printer" :
- echo $lang["connect"][13];
- break;
- case "peripheral" :
- echo $lang["connect"][14];
- break;
- case "monitor" :
- echo $lang["connect"][15];
- break;
-
- default : // computer
- echo "<tr><th colspan='2'>ERROR :</th></tr>";
- }
-
- echo " <select name=type>";
- echo "<option value=name>".$lang["connect"][6]."</option>";
- echo "<option value=id>".$lang["connect"][7]."</option>";
- echo "</select> ";
- echo $lang["connect"][8]." <input type='text' size=10 name=search>";
- echo "<input type='hidden' name='pID1' value=$ID>";
- echo "<input type='hidden' name='device_type' value=$type>";
- echo "<input type='hidden' name='connect' value='2'>";
- echo "</td><td class='tab_bg_2'>";
- echo "<input type='submit' value=\"".$lang["buttons"][11]."\" class='submit'>";
- echo "</td></tr>";
-
- echo "</form>";
- echo "</table>";
- echo "</center>";
-}
-
-
-function listConnectComputers($target,$input) {
-
- GLOBAL $cfg_layout,$cfg_install, $lang;
-
- $pID1 = $input["pID1"];
-
- echo "<center><table class='tab_cadre'>";
- echo "<tr><th colspan='2'>".$lang["connect"][9].":</th></tr>";
- echo "<form method='post' action=\"$target\"><tr><td>";
-
- echo "<tr class='tab_bg_1'>";
- echo "<td align='center'>";
-
- $db = new DB;
- if ($input["type"] == "name") {
- $query = "SELECT glpi_computers.ID as ID,glpi_computers.name as name, glpi_dropdown_locations.ID as location from glpi_computers left join glpi_dropdown_locations on glpi_computers.location = glpi_dropdown_locations.id WHERE glpi_computers.deleted = 'N' AND glpi_computers.name LIKE '%".$input["search"]."%' order by name ASC";
- } else {
- $query = "SELECT glpi_computers.ID as ID,glpi_computers.name as name, glpi_dropdown_locations.ID as location from glpi_computers left join glpi_dropdown_locations on glpi_computers.location = glpi_dropdown_locations.id WHERE glpi_computers.deleted = 'N' AND glpi_computers.ID LIKE '%".$input["search"]."%' order by name ASC";
- }
- $result = $db->query($query);
- $number = $db->numrows($result);
- echo "<select name=\"cID\">";
- while ($i < $number) {
- $dID = $db->result($result, $i, "ID");
- $name = $db->result($result, $i, "name");
- $location = $db->result($result, $i, "location");
- echo "<option value=\"$dID\">".$name." (".getTreeValueName("glpi_dropdown_locations",$location).")</option>";
- $i++;
- }
- echo "</select>";
-
- echo "</td>";
- echo "<td class='tab_bg_2' align='center'>";
- echo "<input type='hidden' name='sID' value=\"".$input["pID1"]."\">";
- echo "<input type='hidden' name='connect' value='3'>";
- echo "<input type='hidden' name='device_type' value='computer'>";
- echo "<input type='submit' value=\"".$lang["buttons"][9]."\" class='submit'>";
- echo "</td></form></tr></table>";
-
-}
-
-function listConnectElement($target,$input) {
-
- GLOBAL $cfg_layout,$cfg_install, $lang;
-
- $pID1 = $input["pID1"];
- $device_type=$input["device_type"];
- $table="";
- switch($device_type){
- case "printer":
- $table="glpi_printers";$device_id=PRINTER_TYPE;break;
- case "monitor":
- $table="glpi_monitors";$device_id=MONITOR_TYPE;break;
- case "peripheral":
- $table="glpi_peripherals";$device_id=PERIPHERAL_TYPE;break;
-
- }
-
- echo "<center><table class='tab_cadre'>";
- echo "<tr><th colspan='2'>";
- switch($device_type){
- case "printer":
- echo $lang["connect"][10];break;
- case "monitor":
- echo $lang["connect"][12];break;
- case "peripheral":
- echo $lang["connect"][11];break;
- }
-
-
- echo ":</th></tr>";
- echo "<form method='post' action=\"$target\"><tr><td>";
-
- echo "<tr class='tab_bg_1'>";
- echo "<td align='center'>";
-
- $db = new DB;
- if ($input["type"] == "name") {
- $query = "SELECT $table.ID as ID,$table.name as name, glpi_dropdown_locations.ID as location from $table left join glpi_dropdown_locations on $table.location = glpi_dropdown_locations.id left join glpi_connect_wire on ($table.ID = glpi_connect_wire.end1 AND glpi_connect_wire.type = $device_id) WHERE $table.deleted='N' AND $table.name LIKE '%".$input["search"]."%' AND glpi_connect_wire.ID IS NULL order by name ASC";
- } else {
- $query = "SELECT $table.ID as ID,$table.name as name, glpi_dropdown_locations.ID as location from $table left join glpi_dropdown_locations on $table.location = glpi_dropdown_locations.id left join glpi_connect_wire on ($table.ID = glpi_connect_wire.end1 AND glpi_connect_wire.type = $device_id) WHERE $table.deleted='N' AND $table.ID LIKE '%".$input["search"]."%' AND glpi_connect_wire.ID IS NULL order by name ASC";
- }
-// echo $query;
- $result = $db->query($query);
- $number = $db->numrows($result);
- if ($number>0) {
- echo "<select name=\"ID\">";
- while ($i < $number) {
- $dID = $db->result($result, $i, "ID");
- $name = $db->result($result, $i, "name");
- $location = $db->result($result, $i, "location");
- echo "<option value=\"$dID\">".$name." (".getTreeValueName("glpi_dropdown_locations",$location).")</option>";
- $i++;
- }
- echo "</select>";
-
- echo "</td>";
- echo "<td class='tab_bg_2' align='center'>";
- echo "<input type='hidden' name='cID' value=\"".$input["pID1"]."\">";
- echo "<input type='hidden' name='connect' value='3'>";
- echo "<input type='hidden' name='device_type' value='$device_id'>";
- echo "<input type='submit' value=\"".$lang["buttons"][9]."\" class='submit'>";
- } else echo $lang["connect"][16]."<br><b><a href=\"".$_SERVER["PHP_SELF"]."?ID=".$input["pID1"]."\">".$lang["buttons"][13]."</a></b>";
-
- echo "</td></form></tr></table>";
-
-}
-
-function printHelpDesk ($name,$from_helpdesk) {
-
- GLOBAL $cfg_layout,$cfg_install,$lang,$cfg_features;
-
- $db = new DB;
-
- $query = "SELECT email,realname,name FROM glpi_users WHERE (name = '$name')";
- $result=$db->query($query);
- $email = $db->result($result,0,"email");
- $realname = $db->result($result,0,"realname");
- $name = $db->result($result,0,"name");
-
- echo "<form method='post' name=\"helpdeskform\" action=\"".$cfg_install["root"]."/tracking/tracking-injector.php\">";
- echo "<input type='hidden' name='from_helpdesk' value='$from_helpdesk'>";
-
- echo "<center><table class='tab_cadre'>";
-
- if ($realname!='') $name=$realname;
-
- echo "<tr><th colspan='2'>".$lang["help"][0]." $name, ".$lang["help"][1].":</th></tr>";
- echo "<tr class='tab_bg_1'>";
- echo "<td>".$lang["help"][2].": </td>";
- echo "<td>";
- dropdownPriority("priority",3);
- echo "</td></tr>";
- if($cfg_features["mailing"] != 0)
- {
- echo "<tr class='tab_bg_1'>";
- echo "<td>".$lang["help"][8].":</td>";
- echo "<td> <select name='emailupdates'>";
- echo "<option value='no' selected>".$lang["help"][9]."";
- echo "<option value='yes'>".$lang["help"][10]."";
- echo "</select>";
- echo "</td></tr>";
- echo "<tr class='tab_bg_1'>";
- echo "<td>".$lang["help"][11].":</td>";
- echo "<td> <input name='uemail' value=\"$email\" size='20'>";
- echo "</td></tr>";
- }
-
- echo "<tr class='tab_bg_1'>";
- echo "<td>".$lang["help"][12]." <a href=\"#\" onClick=\"window.open('".$cfg_install["root"]."/find_num.php','Help','scrollbars=1,resizable=1,width=400,height=400')\"><img src=\"".$cfg_install["root"]."/pics/aide.png\" alt=\"help\"></a></td>";
- echo "<td><input name='computer' size='10'>";
- echo "</td>";
- echo "</tr>";
-
- echo "<tr class='tab_bg_1'>";
- echo "<td>".$lang["help"][24].": </td>";
- echo "<td><select name=device_type>";
- //if (isAdmin($_SESSION["glpitype"]))
- echo "<option value='0' >".$lang["help"][30]."";
- echo "<option value='1' selected>".$lang["help"][25]."";
- echo "<option value='2'>".$lang["help"][26]."";
- echo "<option value='3'>".$lang["help"][27]."";
- echo "<option value='4'>".$lang["help"][28]."";
- echo "<option value='5'>".$lang["help"][29]."";
- echo "<option value='6'>".$lang["help"][31]."";
- echo "</select>";
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_1'>";
- echo "<td colspan='2' align='center'>".$lang["help"][13].":</td>";
- echo "</tr>";
- echo "<tr class='tab_bg_1'>";
- echo "<td colspan='2' align='center'><textarea name='contents' cols='45' rows='14' ></textarea>";
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_1'>";
- echo "<td colspan='2' align='center'> <input type='submit' value=\"".$lang["help"][14]."\" class='submit'>";
- echo "<input type='hidden' name='IRMName' value=\"$name\">";
- echo "</td></tr>";
-
- echo "</table>";
- echo "</center>";
- echo "</form>";
-
-}
-
-function printPager($start,$numrows,$target,$parameters) {
-
- GLOBAL $cfg_layout, $cfg_features, $lang;
-
- // Forward is the next step forward
- $forward = $start+$cfg_features["list_limit"];
-
- // This is the end, my friend
- $end = $numrows-$cfg_features["list_limit"];
-
- // Human readable count starts here
- $current_start=$start+1;
-
- // And the human is viewing from start to end
- $current_end = $current_start+$cfg_features["list_limit"]-1;
- if ($current_end>$numrows) {
- $current_end = $numrows;
- }
-
- // Backward browsing
- if ($current_start-$cfg_features["list_limit"]<=0) {
- $back=0;
- } else {
- $back=$start-$cfg_features["list_limit"];
- }
-
- // Print it
- echo "<br><center><table class='tab_cadre2' width='750'>";
- echo "<tr>";
-
- // Back and fast backward button
- if (!$start==0) {
- echo "<th align='left'>";
- echo "<a href=\"$target?$parameters&start=$back\">";
- echo " < ";
- echo "</a></th>";
- echo "<th align='left'>";
- echo "<a href=\"$target?$parameters&start=0\">";
- echo " << ";
- echo "</a></th>";
- }
-
- // Print the "where am I?"
- echo "<td width='750' align='center' class='tab_bg_2'><b>";
- echo $lang["pager"][2]." ".$current_start." ".$lang["pager"][1]." ".$current_end." ".$lang["pager"][3]." ".$numrows." ";
- echo "</b></td>";
-
- // Forward and fast forward button
- if ($forward<$numrows) {
- echo "<th align='right'>";
- echo "<a href=\"$target?$parameters&start=$forward\">";
- echo " > ";
- echo "</a></th>";
- echo "<th align='right'>";
- echo "<a href=\"$target?$parameters&start=$end\">";
- echo " >> ";
- echo "</a></th>";
- }
-
- // End pager
- echo "</tr>";
- echo "</table></center>";
-}
-
-function report_perso($item_type,$query)
-//affiche un rapport personalisé a partir d'une requete $query
-//pour un type de materiel ($item_type)
-{
-
-GLOBAL $cfg_layout, $cfg_features, $lang;
-
-$db = new DB;
-$result = $db->query($query);
-include ("_relpos.php");
-
-
-switch($item_type)
- {
- case 'glpi_computers' :
-
-
- echo " <strong>".$lang["reports"][5]."</strong>";
- echo "<table width='100%' height='60' border='0' bordercolor='black'>";
- echo "<tr>";
- echo "<th><div align='center'><b>".$lang["computers"][7]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["computers"][16]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["computers"][9]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["computers"][21]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["computers"][22]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["computers"][10]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["computers"][17]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["computers"][23]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["computers"][24]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["computers"][41]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["computers"][42]."</b></div></th>";
- echo "</tr>";
- while( $ligne = $db->fetch_array($result))
- {
-
- $name = $ligne['name'];
- $os = $ligne['os'];
- $processor = $ligne['processor'];
- $processor_speed = $ligne['processor_speed'];
- $lieu = $ligne['location'];
- $serial = $ligne['serial'];
- $ramType = $ligne['ramtype'];
- $ramSize = $ligne['ram'];
- $contact = $ligne['contact'];
- $achat_date = $ligne['achat_date'];
- $fin_garantie = $ligne['date_fin_garantie'];
-
- //inserer ces valeures dans un tableau
-
- echo "<tr>";
- if($name) echo "<td><div align='center'> $name </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($contact) echo "<td><div align='center'> $contact </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($os) echo "<td><div align='center'> ".getDropdownName("glpi_dropdown_os",$os)." </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($processor) echo "<td><div align='center'> ".getDropdownName("glpi_dropdown_processor",$processor)." </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($processor_speed) echo "<td><div align='center'> $processor_speed </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($lieu) echo "<td><div align='center'> ".getDropdownName("glpi_dropdown_locations",$lieu)." </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($serial) echo "<td><div align='center'> $serial </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($ramType) echo "<td><div align='center'> ".getDropdownName("glpi_dropdown_ram",$ramType)." </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($ramSize) echo "<td><div align='center'> $ramSize </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($achat_date) echo "<td><div align='center'> $achat_date </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($fin_garantie) echo "<td><div align='center'> $fin_garantie </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- echo "</tr>";
- }
- echo "</table><br><hr><br> ";
- break;
-
- case 'glpi_printers' :
-
- echo "<b><strong>".$lang["reports"][1]."</strong></b>";
- echo "<table width='100%' height='60' border='0'>";
- echo "<tr> ";
- echo "<th><div align='center'><b>".$lang["printers"][5]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["printers"][8]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["printers"][9]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["printers"][6]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["printers"][10]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["printers"][23]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["printers"][20]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["printers"][21]."</b></div></th>";
- echo "</tr>";
-
- while( $ligne = $db->fetch_array($result))
- {
- $type = $ligne['type'];
- $name = $ligne['name'];
- $lieu = $ligne['location'];
- $serial = $ligne['serial'];
- $contact = $ligne['contact'];
- $achat_date = $ligne['achat_date'];
- $fin_garantie = $ligne['date_fin_garantie'];
- $ramSize = $ligne['ramSize'];
-
- //inserer ces valeures dans un tableau
- echo "<tr>";
- if($name) echo "<td><div align='center'>$name</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($contact) echo "<td><div align='center'>$contact</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($type) echo "<td><div align='center'>".getDropdownName("glpi_type_printers",$type)."</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($lieu) echo "<td><div align='center'>".getDropdownName("glpi_dropdown_locations",$lieu)."</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($serial) echo "<td><div align='center'>$serial</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($ramSize) echo "<td><div align='center'>$ramSize</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($achat_date) echo "<td><div align='center'>$achat_date</div></td>"; else echo "<td><div align='center'> N/A</div> </td>";
- if($fin_garantie) echo "<td><div align='center'> $fin_garantie </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- echo "</tr>";
- }
- echo "</table><br><hr><br>";
- break;
-
- case 'glpi_monitors' :
-
- echo " <b><strong>".$lang["reports"][2]."</strong></b>";
- echo "<table width='100%' height='60' border='0'>";
- echo "<tr> ";
- echo "<th><div align='center'><b>".$lang["monitors"][5]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["monitors"][9]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["monitors"][21]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["monitors"][8]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["monitors"][6]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["monitors"][10]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["monitors"][24]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["monitors"][25]."</b></div></th>";
- echo "</tr>";
-
- while( $ligne = $db->fetch_array($result))
- {
- $name = $ligne['name'];
- $lieu = $ligne['location'];
- $type = $ligne['type'];
- $contact = $ligne['contact'];
- $serial = $ligne['serial'];
- $achat_date = $ligne['achat_date'];
- $size = $ligne['size'];
- $fin_garantie = $ligne['date_fin_garantie'];
- //inserer ces valeures dans un tableau
-
- echo "<tr>";
- if($name) echo "<td><div align='center'>$name</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($type) echo "<td><div align='center'>".getDropdownName("glpi_type_monitors",$type)."</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($size) echo "<td><div align='center'>$size</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($contact) echo "<td><div align='center'>$contact</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($lieu) echo "<td><div align='center'>".getDropdownName("glpi_dropdown_locations",$lieu)."</div></td>"; else echo "<td><div align='center'>N/A </div></td>";
- if($serial) echo "<td><div align='center'>$serial</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($achat_date) echo "<td><div align='center'>$achat_date</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($fin_garantie) echo "<td><div align='center'> $fin_garantie </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- echo "</tr>";
- }
- echo "</table><br><hr><br>";
- break;
-
- case 'glpi_networking' :
-
- echo " <b><strong>".$lang["reports"][3]."</strong></b>";
- echo "<table width='100%' height='60' border='0'>";
- echo "<tr> ";
- echo "<th><div align='center'><b>".$lang["networking"][0]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["networking"][2]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["networking"][3]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["networking"][1]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["networking"][6]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["networking"][39]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["networking"][40]."</b></div></th>";
- echo "</tr>";
-
- while( $ligne = $db->fetch_array($result))
- {
- $name = $ligne['name'];
- $lieu = $ligne['location'];
- $type = $ligne['type'];
- $contact = $ligne['contact'];
- $serial = $ligne['serial'];
- $achat_date = $ligne['achat_date'];
- $fin_garantie = $ligne['date_fin_garantie'];
- //inserer ces valeures dans un tableau
-
- echo "<tr> ";
- if($name) echo "<td><div align='center'>$name</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($type) echo "<td><div align='center'></div>".getDropdownName("glpi_type_networking",$type)."</td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($contact) echo "<td><div align='center'>$contact</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($lieu) echo "<td><div align='center'>".getDropdownName("glpi_dropdown_locations",$lieu)."</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($serial) echo "<td><div align='center'>$serial</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($achat_date) echo "<td><div align='center'>$achat_date</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($fin_garantie) echo "<td><div align='center'> $fin_garantie </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- echo "</tr>";
- }
- echo "</table><br><hr><br>";
- break;
- case 'glpi_peripherals' :
-
- echo " <b><strong>".$lang["reports"][30]."</strong></b>";
- echo "<table width='100%' height='60' border='0'>";
- echo "<tr> ";
- echo "<th><div align='center'><b>".$lang["peripherals"][5]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["peripherals"][9]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["peripherals"][8]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["peripherals"][6]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["peripherals"][10]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["peripherals"][24]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["peripherals"][25]."</b></div></th>";
- echo "</tr>";
-
- while( $ligne = $db->fetch_array($result))
- {
- $name = $ligne['name'];
- $lieu = $ligne['location'];
- $type = $ligne['type'];
- $contact = $ligne['contact'];
- $serial = $ligne['serial'];
- $achat_date = $ligne['achat_date'];
- $fin_garantie = $ligne['date_fin_garantie'];
- //inserer ces valeures dans un tableau
-
- echo "<tr>";
- if($name) echo "<td><div align='center'>$name</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($type) echo "<td><div align='center'>".getDropdownName("glpi_type_peripherals",$type)."</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($contact) echo "<td><div align='center'>$contact</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($lieu) echo "<td><div align='center'>".getDropdownName("glpi_dropdown_locations",$lieu)."</div></td>"; else echo "<td><div align='center'>N/A </div></td>";
- if($serial) echo "<td><div align='center'>$serial</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($achat_date) echo "<td><div align='center'>$achat_date</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($fin_garantie) echo "<td><div align='center'> $fin_garantie </div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- echo "</tr>";
- }
- echo "</table><br><hr><br>";
- break;
-
- //rapport reseau par etage
- case 'glpi_networking_etage' :
- echo "<table width='100%' height='60' border='0'>";
- echo "<tr> ";
- //echo "<th><div align='center'><b>".$lang["reports"][34]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][35]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][37]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][41]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][46]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][47]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][36]."</b></div></th>";
- echo "</tr>";
-
- while( $ligne = $db->fetch_array($result))
- {
- //echo $ligne['location'];
- //print_r($ligne);
- $bureau = $ligne['bureau'];
- //$etage=$ligne['etage'];
- $prise=$ligne['prise'];
- $port=$ligne['port'];
- $switch=$ligne['switch'];
- $portordi=$ligne['portordi'];
- $ordi=$ligne['ordi'];
- //inserer ces valeures dans un tableau
-
- echo "<tr>";
- //if($etage) echo "<td><div align='center'>$etage</div></td>"; else echo //"<td><div align='center'> N/A </div></td>";
- if($bureau) echo "<td><div align='center'>$bureau</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($prise) echo "<td><div align='center'>$prise</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($switch) echo "<td><div align='center'>$switch</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($port) echo "<td><div align='center'>$port</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($portordi) echo "<td><div align='center'>$portordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($ordi) echo "<td><div align='center'>$ordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- }
- echo "</table><br><hr><br>";
- break;
-
- //rapport reseau par bureau
- case 'glpi_networking_bureau' :
- echo "<table width='100%' height='60' border='0'>";
- echo "<tr> ";
- //echo "<th><div align='center'><b>".$lang["reports"][34]."</b></div></th>";
- //echo "<th><div align='center'><b>".$lang["reports"][35]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][37]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][41]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][46]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][47]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][36]."</b></div></th>";
- echo "</tr>";
-
- while( $ligne = $db->fetch_array($result))
- {
- //echo $ligne['location'];
- //print_r($ligne);
- //$bureau = $ligne['bureau'];
- //$etage=$ligne['etage'];
- $prise=$ligne['prise'];
- $port=$ligne['port'];
- $switch=$ligne['switch'];
- $portordi=$ligne['portordi'];
- $ordi=$ligne['ordi'];
- //inserer ces valeures dans un tableau
-
- echo "<tr>";
- /*if($etage) echo "<td><div align='center'>$etage</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($bureau) echo "<td><div align='center'>$bureau</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- */
- if($prise) echo "<td><div align='center'>$prise</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($switch) echo "<td><div align='center'>$switch</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($port) echo "<td><div align='center'>$port</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($portordi) echo "<td><div align='center'>$portordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($ordi) echo "<td><div align='center'>$ordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- }
- echo "</table><br><hr><br>";
- break;
-
- //rapport reseau par switch
- case 'glpi_networking_switch' :
- echo "<table width='100%' height='60' border='0'>";
- echo "<tr> ";
- //echo "<th><div align='center'><b>".$lang["reports"][42]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][35]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][39]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][37]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][46]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][47]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][36]."</b></div></th>";
- echo "</tr>";
-
- while( $ligne = $db->fetch_array($result))
- {
- //$switch = $ligne['switch'];
- //echo $ligne['location'];
- //print_r($ligne);
- $bureau=$ligne['bureau'];
- $etage=$ligne['etage'];
- $prise=$ligne['prise'];
- $port = $ligne['port'];
- $portordi=$ligne['portordi'];
- $ordi=$ligne['ordi'];
-
- //inserer ces valeures dans un tableau
-
- echo "<tr>";
- //if($switch) echo "<td><div align='center'>$switch</div></td>"; else echo //"<td><div align='center'> N/A </div></td>";
- if($bureau) echo "<td><div align='center'>$bureau</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($etage) echo "<td><div align='center'>$etage</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($prise) echo "<td><div align='center'>$prise</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($port) echo "<td><div align='center'>$port</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($portordi) echo "<td><div align='center'>$portordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($ordi) echo "<td><div align='center'>$ordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- }
- echo "</table><br><hr><br>";
- break;
-
- //rapport reseau par prise
- case 'glpi_networking_prise' :
- echo "<table width='100%' height='60' border='0'>";
- echo "<tr> ";
- //echo "<th><div align='center'><b>".$lang["reports"][44]."</b></div></th>";
- //echo "<th><div align='center'><b>".$lang["reports"][39]."</b></div></th>";
- //echo "<th><div align='center'><b>".$lang["reports"][43]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][42]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][46]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][47]."</b></div></th>";
- echo "<th><div align='center'><b>".$lang["reports"][36]."</b></div></th>";
- echo "</tr>";
-
- while( $ligne = $db->fetch_array($result))
- {
- $prise=$ligne['prise'];
- $bureau = $ligne['bureau'];
- $etage=$ligne['etage'];
- $switch=$ligne['switch'];
- $port=$ligne['port'];
- $portordi=$ligne['portordi'];
- $ordi=$ligne['ordi'];
- //echo $ligne['location'];
- //print_r($ligne);
- //$ports=$ligne['ports'];
- //$ifaddr = $ligne['ifaddr'];
-
-
- //inserer ces valeures dans un tableau
-
- echo "<tr>";
- //if($prise) echo "<td><div align='center'>$prise</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- //if($etage) echo "<td><div align='center'>$etage</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- //if($bureau) echo "<td><div align='center'>$bureau</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($switch) echo "<td><div align='center'>$switch</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($port) echo "<td><div align='center'>$port</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($portordi) echo "<td><div align='center'>$portordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- if($ordi) echo "<td><div align='center'>$ordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
- }
- echo "</table><br><hr><br>";
- break;
-
- }
-}
-
-function countElementsInTable($table){
-$db=new DB;
-$query="SELECT count(*) as cpt from $table";
-$result=$db->query($query);
-$ligne = $db->fetch_array($result);
-return $ligne['cpt'];
-}
-
-
-//****************
-// De jolies fonctions pour améliorer l'affichage du texte de la FAQ/knowledgbase
-//***************
-
-
-function autop($pee, $br=1) {
-
-// Remplace trés AVANTAGEUSEMENT nl2br
-// Met en "ordre" une chaine avant affichage
-
-// Thanks to Matthew Mullenweg
-
-$pee = preg_replace("/(\r\n|\n|\r)/", "\n", $pee); // cross-platform newlines
-$pee = preg_replace("/\n\n+/", "\n\n", $pee); // take care of duplicates
-$pee = preg_replace('/\n?(.+?)(\n\n|\z)/s', "<p>$1</p>\n", $pee); // make paragraphs, including one at the end
-if ($br) $pee = preg_replace('|(?<!</p>)\s*\n|', "<br>\n", $pee); // optionally make line breaks
-return $pee;
-}
-
-
-
-function clicurl($chaine){
-
-// Rend une url cliquable htp/https/ftp meme avec une variable Get
-
-$text=preg_replace("`((?:https?|ftp)://\S+)(\s|\z)`", '<a href="$1">$1</a>$2', $chaine);
-
-return $text;
-}
-
-
-//
-// Split the message into tokens ($inside contains all text inside $start and $end, and $outside contains all text outside)
-//
-function split_text($text, $start, $end)
-{
-
-// Adapté de PunBB
-//Copyright (C) Rickard Andersson ([EMAIL PROTECTED])
-
- $tokens = explode($start, $text);
-
- $outside[] = $tokens[0];
-
- $num_tokens = count($tokens);
- for ($i = 1; $i < $num_tokens; ++$i)
- {
- $temp = explode($end, $tokens[$i]);
- $inside[] = $temp[0];
- $outside[] = $temp[1];
- }
-
-
-
- return array($inside, $outside);
-}
-
-
-
-
-
-function rembo($string){
-
-// Adapté de PunBB
-//Copyright (C) Rickard Andersson ([EMAIL PROTECTED])
-
-
-
-// If the message contains a code tag we have to split it up (text within [code][/code] shouldn't be touched)
- if (strpos($string, '[code]') !== false && strpos($string, '[/code]') !== false)
- {
- list($inside, $outside) = split_text($string, '[code]', '[/code]');
- $outside = array_map('trim', $outside);
- $string = implode('<">', $outside);
- }
-
-
-
-
- $pattern = array('#\[b\](.*?)\[/b\]#s',
- '#\[i\](.*?)\[/i\]#s',
- '#\[u\](.*?)\[/u\]#s',
- //'#\[url\](.*?)\[/url\]#e',
- //'#\[url=(.*?)\](.*?)\[/url\]#e',
- '#\[email\](.*?)\[/email\]#',
- '#\[email=(.*?)\](.*?)\[/email\]#',
- '#\[color=([a-zA-Z]*|\#?[0-9a-fA-F]{6})](.*?)\[/color\]#s');
-
- $replace = array('<strong>$1</strong>',
- '<em>$1</em>',
- '<u>$1</u>',
- // 'truncate_url(\'$1\')',
- //'truncate_url(\'$1\', \'$2\')',
- '<a href="mailto:$1">$1</a>',
- '<a href="mailto:$1">$2</a>',
- '<span style="color: $1">$2</span>');
-
- // This thing takes a while! :)
- $string = preg_replace($pattern, $replace, $string);
-
-
-
- $string=clicurl($string);
-
- $string=autop($string);
-
-
- // If we split up the message before we have to concatenate it together again (code tags)
- if (isset($inside))
- {
- $outside = explode('<">', $string);
- $string = '';
-
- $num_tokens = count($outside);
-
- for ($i = 0; $i < $num_tokens; ++$i)
- {
- $string .= $outside[$i];
- if (isset($inside[$i]))
- $string .= '<br><br><table style="width: 95%; border: dotted 2px #cccccc;" align="center" cellspacing="4" cellpadding="6"><tr><td class="punquote"><b>Code:</b><br><br><pre>'.trim($inside[$i]).'</pre></td></tr></table><br>';
- }
- }
-
-
-
-
-
-
- return $string;
-}
-
-function showTreeListSelect($table,$current, $parentID=0,$bur=0, $categoryname="")
-{
- /*
- arguments de showTreeListSelect
- - table:la table dans laquelle on execute la reqête
- - current
- - parentID
- - bur: si il vaut 0 on affiche seulement les étages, sinon on affiche les bureaux
- */
-
- $query = "select * from $table where (parentID = $parentID) order by name ";
-
-
-
- $db=new DB;
- //renvoie les etages et les bureaux
- if($bur==0){
- if ($result=$db->query($query)){
- if ($db->numrows($result)>0){
-
-
- while ($row=$db->fetch_array($result)){
-
- $ID = $row["ID"];
- $name = $categoryname . $row["name"];
- echo "<option value='$ID'";
- if($current == $ID)
- {
- echo " selected";
- }
- echo ">$name</option>\n";
- $name = $name . "\\";
- $bur=1;
- showTreeListSelect($table,$current, $ID,$bur,$name);
- }
- } }
- }
-
- //renvoie seulement les bureaux
- else{
- if ($result=$db->query($query)){
- if ($db->numrows($result)>0){
-
-
- while ($row=$db->fetch_array($result)){
- //print_r($row);
-
- $ID = $row["ID"];
- $name = $categoryname . $row["name"];
- if(strchr($name,"\\"))
- {
- echo "<option value='$ID'";
-
- if($current == $ID)
- {
- echo " selected";
-
- }
- echo ">$name</option>\n";
- }
- $name = $name . "\\";
-
- showTreeListSelect($table,$current, $ID,$bur,$name);
-
-
- }
- } }
-}
-}
-
-
-function getTreeLeafValueName($table,$ID)
-{
- $query = "select * from $table where (ID = $ID)";
- $db=new DB;
- $name="";
- if ($result=$db->query($query)){
- if ($db->numrows($result)==1){
- $name=$db->result($result,0,"name");
- }
-
- }
-return $name;
-}
-
-function getTreeValueName($table,$ID, $wholename="")
-{
- // show name catégory
- // ok ??
-
- global $lang;
-
- $query = "select * from $table where (ID = $ID)";
- $db=new DB;
-
- if ($result=$db->query($query)){
- if ($db->numrows($result)>0){
-
- $row=$db->fetch_array($result);
-
- $parentID = $row["parentID"];
- if($wholename == "")
- {
- $name = $row["name"];
- } else
- {
- $name = $row["name"] . "\\";
- }
- $name = getTreeValueName($table,$parentID, $name) . $name;
- }
-
- }
-return (@$name);
-}
-
-function showCalendarForm($form,$element,$value=''){
- global $HTMLRel,$lang;
- echo "<input type='text' name='$element' readonly size='10' value='$value'>";
-
- echo " <img src='".$HTMLRel."pics/calendar.png' class='calendrier' alt='".$lang["buttons"][15]."' title='".$lang["buttons"][15]."'
- onclick=\"window.open('$HTMLRel/mycalendar.php?form=$form&elem=$element&value=$value','".$lang["buttons"][15]."','width=200,height=220')\" >";
-
- echo " <img src='".$HTMLRel."pics/reset.png' class='calendrier' onClick=\"document.forms['$form'].$element.value='0000-00-00'\" alt='Reset' title='Reset'>";
-}
-
-?>
diff -Nur web/glpi/glpi/glpi/common/Pfunctions.diff glpi/glpi/common/Pfunctions.diff
--- web/glpi/glpi/glpi/common/Pfunctions.diff 2005-03-04 11:14:32.000000000 +0100
+++ glpi/glpi/common/Pfunctions.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,332 +0,0 @@
---- functions.php 2005-03-04 00:58:18.000000000 +0100
-+++ functionsB.php 2005-03-04 10:42:58.000000000 +0100
-@@ -844,9 +844,12 @@
- echo "</select>";
- }
- }
-+ /*!
-+ \brief remplie la dropdown avec la colonne d'une table passée en argument
-+*/
-+
-
--
--function dropdownValue($table,$myname,$value) {
-+function dropdownValue($table,$myname,$value,$bur=0) {
-
- global $deleted_tables;
-
-@@ -855,7 +858,7 @@
- if ($table == "glpi_dropdown_locations" || $table=="glpi_dropdown_kbcategories"){
- echo "<select name=\"$myname\">";
- echo "<option value=\"0\">-----</option>";
-- showTreeListSelect($table,$value, 0);
-+ showTreeListSelect($table,$value, 0,$bur);
- echo "</select>";
- }
- else if($table == "glpi_dropdown_netpoint") {
-@@ -986,14 +989,11 @@
-
- function dropdownValueSearch($table,$myname,$value,$search) {
- // Make a select box with preselected values
-- global $deleted_tables;
-+ if(is_string($search))
-+ {
- $db = new DB;
-
-- $where="";
-- if (in_array($table,$deleted_tables))
-- $where="AND deleted='N'";
--
-- $query = "SELECT * FROM $table WHERE name LIKE '%$search%' $where ORDER BY name";
-+ $query = "SELECT * FROM $table WHERE name LIKE '%$search%' ORDER BY name";
- $result = $db->query($query);
-
-
-@@ -1024,6 +1024,43 @@
- }
- }
- echo "</select>";
-+ }
-+ else
-+ {
-+ $db = new DB;
-+
-+ $query = "SELECT * FROM $table WHERE Parentid LIKE '$search' ORDER BY name";
-+ $result = $db->query($query);
-+
-+
-+ $number = $db->numrows($result);
-+ if ($number == 0) {
-+ $query = "SELECT * FROM $table ORDER BY name";
-+ $result = $db->query($query);
-+ $number = $db->numrows($result);
-+ }
-+
-+ echo "<select name=\"$myname\" size='1'>";
-+
-+ if ($number > 0) {
-+ $i = 0;
-+ while ($i < $number) {
-+ if ($table=="glpi_software")
-+ $output = $db->result($result, $i, "name")." ".$db->result($result, $i, "version");
-+ else
-+ $output = $db->result($result, $i, "name");
-+ $ID = $db->result($result, $i, "ID");
-+
-+ if ($ID == $value) {
-+ echo "<option value=\"$ID\" selected>$output</option>";
-+ } else {
-+ echo "<option value=\"$ID\">$output</option>";
-+ }
-+ $i++;
-+ }
-+ }
-+ echo "</select>";
-+ }
- }
-
- function dropdownUsers($value, $myname) {
-@@ -1770,6 +1807,164 @@
- echo "</table><br><hr><br>";
- break;
-
-+ //rapport reseau par etage
-+ case 'glpi_networking_etage' :
-+ echo "<table width='100%' height='60' border='0'>";
-+ echo "<tr> ";
-+ //echo "<th><div align='center'><b>".$lang["reports"][34]."</b></div></th>";
-+ echo "<th><div align='center'><b>".$lang["reports"][35]."</b></div></th>";
-+ echo "<th><div align='center'><b>".$lang["reports"][37]."</b></div></th>";
-+ echo "<th><div align='center'><b>".$lang["reports"][41]."</b></div></th>";
-+ echo "<th><div align='center'><b>".$lang["reports"][46]."</b></div></th>";
-+ echo "<th><div align='center'><b>".$lang["reports"][47]."</b></div></th>";
-+ echo "<th><div align='center'><b>".$lang["reports"][36]."</b></div></th>";
-+ echo "</tr>";
-+
-+ while( $ligne = $db->fetch_array($result))
-+ {
-+ //echo $ligne['location'];
-+ //print_r($ligne);
-+ $bureau = $ligne['bureau'];
-+ //$etage=$ligne['etage'];
-+ $prise=$ligne['prise'];
-+ $port=$ligne['port'];
-+ $switch=$ligne['switch'];
-+ $portordi=$ligne['portordi'];
-+ $ordi=$ligne['ordi'];
-+ //inserer ces valeures dans un tableau
-+
-+ echo "<tr>";
-+ //if($etage) echo "<td><div align='center'>$etage</div></td>"; else echo //"<td><div align='center'> N/A </div></td>";
-+ if($bureau) echo "<td><div align='center'>$bureau</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ if($prise) echo "<td><div align='center'>$prise</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ if($switch) echo "<td><div align='center'>$switch</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ if($port) echo "<td><div align='center'>$port</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ if($portordi) echo "<td><div align='center'>$portordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ if($ordi) echo "<td><div align='center'>$ordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ }
-+ echo "</table><br><hr><br>";
-+ break;
-+
-+ //rapport reseau par bureau
-+ case 'glpi_networking_bureau' :
-+ echo "<table width='100%' height='60' border='0'>";
-+ echo "<tr> ";
-+ //echo "<th><div align='center'><b>".$lang["reports"][34]."</b></div></th>";
-+ //echo "<th><div align='center'><b>".$lang["reports"][35]."</b></div></th>";
-+ echo "<th><div align='center'><b>".$lang["reports"][37]."</b></div></th>";
-+ echo "<th><div align='center'><b>".$lang["reports"][41]."</b></div></th>";
-+ echo "<th><div align='center'><b>".$lang["reports"][46]."</b></div></th>";
-+ echo "<th><div align='center'><b>".$lang["reports"][47]."</b></div></th>";
-+ echo "<th><div align='center'><b>".$lang["reports"][36]."</b></div></th>";
-+ echo "</tr>";
-+
-+ while( $ligne = $db->fetch_array($result))
-+ {
-+ //echo $ligne['location'];
-+ //print_r($ligne);
-+ //$bureau = $ligne['bureau'];
-+ //$etage=$ligne['etage'];
-+ $prise=$ligne['prise'];
-+ $port=$ligne['port'];
-+ $switch=$ligne['switch'];
-+ $portordi=$ligne['portordi'];
-+ $ordi=$ligne['ordi'];
-+ //inserer ces valeures dans un tableau
-+
-+ echo "<tr>";
-+ /*if($etage) echo "<td><div align='center'>$etage</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ if($bureau) echo "<td><div align='center'>$bureau</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ */
-+ if($prise) echo "<td><div align='center'>$prise</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ if($switch) echo "<td><div align='center'>$switch</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ if($port) echo "<td><div align='center'>$port</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ if($portordi) echo "<td><div align='center'>$portordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ if($ordi) echo "<td><div align='center'>$ordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ }
-+ echo "</table><br><hr><br>";
-+ break;
-+
-+ //rapport reseau par switch
-+ case 'glpi_networking_switch' :
-+ echo "<table width='100%' height='60' border='0'>";
-+ echo "<tr> ";
-+ //echo "<th><div align='center'><b>".$lang["reports"][42]."</b></div></th>";
-+ echo "<th><div align='center'><b>".$lang["reports"][35]."</b></div></th>";
-+ echo "<th><div align='center'><b>".$lang["reports"][39]."</b></div></th>";
-+ echo "<th><div align='center'><b>".$lang["reports"][37]."</b></div></th>";
-+ echo "<th><div align='center'><b>".$lang["reports"][46]."</b></div></th>";
-+ echo "<th><div align='center'><b>".$lang["reports"][47]."</b></div></th>";
-+ echo "<th><div align='center'><b>".$lang["reports"][36]."</b></div></th>";
-+ echo "</tr>";
-+
-+ while( $ligne = $db->fetch_array($result))
-+ {
-+ //$switch = $ligne['switch'];
-+ //echo $ligne['location'];
-+ //print_r($ligne);
-+ $bureau=$ligne['bureau'];
-+ $etage=$ligne['etage'];
-+ $prise=$ligne['prise'];
-+ $port = $ligne['port'];
-+ $portordi=$ligne['portordi'];
-+ $ordi=$ligne['ordi'];
-+
-+ //inserer ces valeures dans un tableau
-+
-+ echo "<tr>";
-+ //if($switch) echo "<td><div align='center'>$switch</div></td>"; else echo //"<td><div align='center'> N/A </div></td>";
-+ if($bureau) echo "<td><div align='center'>$bureau</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ if($etage) echo "<td><div align='center'>$etage</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ if($prise) echo "<td><div align='center'>$prise</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ if($port) echo "<td><div align='center'>$port</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ if($portordi) echo "<td><div align='center'>$portordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ if($ordi) echo "<td><div align='center'>$ordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ }
-+ echo "</table><br><hr><br>";
-+ break;
-+
-+ //rapport reseau par prise
-+ case 'glpi_networking_prise' :
-+ echo "<table width='100%' height='60' border='0'>";
-+ echo "<tr> ";
-+ //echo "<th><div align='center'><b>".$lang["reports"][44]."</b></div></th>";
-+ //echo "<th><div align='center'><b>".$lang["reports"][39]."</b></div></th>";
-+ //echo "<th><div align='center'><b>".$lang["reports"][43]."</b></div></th>";
-+ echo "<th><div align='center'><b>".$lang["reports"][42]."</b></div></th>";
-+ echo "<th><div align='center'><b>".$lang["reports"][46]."</b></div></th>";
-+ echo "<th><div align='center'><b>".$lang["reports"][47]."</b></div></th>";
-+ echo "<th><div align='center'><b>".$lang["reports"][36]."</b></div></th>";
-+ echo "</tr>";
-+
-+ while( $ligne = $db->fetch_array($result))
-+ {
-+ $prise=$ligne['prise'];
-+ $bureau = $ligne['bureau'];
-+ $etage=$ligne['etage'];
-+ $switch=$ligne['switch'];
-+ $port=$ligne['port'];
-+ $portordi=$ligne['portordi'];
-+ $ordi=$ligne['ordi'];
-+ //echo $ligne['location'];
-+ //print_r($ligne);
-+ //$ports=$ligne['ports'];
-+ //$ifaddr = $ligne['ifaddr'];
-+
-+
-+ //inserer ces valeures dans un tableau
-+
-+ echo "<tr>";
-+ //if($prise) echo "<td><div align='center'>$prise</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ //if($etage) echo "<td><div align='center'>$etage</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ //if($bureau) echo "<td><div align='center'>$bureau</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ if($switch) echo "<td><div align='center'>$switch</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ if($port) echo "<td><div align='center'>$port</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ if($portordi) echo "<td><div align='center'>$portordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ if($ordi) echo "<td><div align='center'>$ordi</div></td>"; else echo "<td><div align='center'> N/A </div></td>";
-+ }
-+ echo "</table><br><hr><br>";
-+ break;
-+
- }
- }
-
-@@ -1913,15 +2108,27 @@
- return $string;
- }
-
--function showTreeListSelect($table,$current, $parentID=0, $categoryname="")
-+function showTreeListSelect($table,$current, $parentID=0,$bur=0, $categoryname="")
- {
-+ /*
-+ arguments de showTreeListSelect
-+ - table:la table dans laquelle on execute la reqête
-+ - current
-+ - parentID
-+ - bur: si il vaut 0 on affiche seulement les étages, sinon on affiche les bureaux
-+ */
-+
- $query = "select * from $table where (parentID = $parentID) order by name ";
-+
-+
-
- $db=new DB;
--
-+ //renvoie les etages et les bureaux
-+ if($bur==0){
- if ($result=$db->query($query)){
- if ($db->numrows($result)>0){
--
-+
-+
- while ($row=$db->fetch_array($result)){
-
- $ID = $row["ID"];
-@@ -1933,12 +2140,44 @@
- }
- echo ">$name</option>\n";
- $name = $name . "\\";
-- showTreeListSelect($table,$current, $ID, $name);
-+ $bur=1;
-+ showTreeListSelect($table,$current, $ID,$bur,$name);
-+ }
-+ } }
-+ }
-+
-+ //renvoie seulement les bureaux
-+ else{
-+ if ($result=$db->query($query)){
-+ if ($db->numrows($result)>0){
-+
-+
-+ while ($row=$db->fetch_array($result)){
-+ //print_r($row);
-+
-+ $ID = $row["ID"];
-+ $name = $categoryname . $row["name"];
-+ if(strchr($name,"\\"))
-+ {
-+ echo "<option value='$ID'";
-+
-+ if($current == $ID)
-+ {
-+ echo " selected";
-+
-+ }
-+ echo ">$name</option>\n";
-+ }
-+ $name = $name . "\\";
-+
-+ showTreeListSelect($table,$current, $ID,$bur,$name);
-+
-+
- }
- } }
--
--
- }
-+}
-+
-
- function getTreeLeafValueName($table,$ID)
- {
diff -Nur web/glpi/glpi/glpi/common/_relpos.php glpi/glpi/common/_relpos.php
--- web/glpi/glpi/glpi/common/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/common/_relpos.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/computers/classes.php glpi/glpi/computers/classes.php
--- web/glpi/glpi/glpi/computers/classes.php 2005-03-07 09:57:34.000000000 +0100
+++ glpi/glpi/computers/classes.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/computers/CVS/Entries glpi/glpi/computers/CVS/Entries
--- web/glpi/glpi/glpi/computers/CVS/Entries 2005-03-07 09:57:34.000000000 +0100
+++ glpi/glpi/computers/CVS/Entries 2005-03-07 14:02:49.000000000 +0100
@@ -1,4 +1,4 @@
-/_relpos.php/1.4/Sat Feb 12 16:00:10 2005//
-/classes.php/1.27/Mon Mar 7 08:57:34 2005//
-/functions.php/1.86/Result of merge//
+/_relpos.php/1.5/Mon Mar 7 10:44:24 2005//
+/classes.php/1.28/Mon Mar 7 10:44:24 2005//
+/functions.php/1.88/Mon Mar 7 11:02:39 2005//
D
diff -Nur web/glpi/glpi/glpi/computers/functions.php glpi/glpi/computers/functions.php
--- web/glpi/glpi/glpi/computers/functions.php 2005-03-07 11:26:11.000000000 +0100
+++ glpi/glpi/computers/functions.php 2005-03-07 12:02:39.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
@@ -45,7 +46,7 @@
echo "<div align='center'><table border='0'><tr><td>";
echo "<img src=\"".$HTMLRel."pics/computer.png\" alt='".$lang["computers"][0]."' title='".$lang["computers"][0]."'></td><td><a class='icon_consol' href=\"computers-add-select.php\"><b>".$lang["computers"][0]."</b></a>";
echo "</td>";
- echo "<td><a href='".$HTMLRel."setup/setup-templates.php?type=".COMPUTER_TYPE."'>".$lang["common"][8]."</a></td>";
+ echo "<td><a class='icon_consol' href='".$HTMLRel."setup/setup-templates.php?type=".COMPUTER_TYPE."'>".$lang["common"][9]."</a></td>";
echo "</tr></table></div>";
}
@@ -383,19 +384,9 @@
echo "</td>";
-
-
echo "<td>".$lang["computers"][15]." : </td><td><input type='text' name='contact_num' value=\"".$comp->fields["contact_num"]."\" size='20'></td></tr>";
- echo "<tr class='tab_bg_1'>";
- echo "<td >".$lang["computers"][50]." : </td>";
- echo "<td >";
- dropdownValue("glpi_contacts", "tech_num", $comp->fields["tech_num"]);
- echo "</td>";
- echo "<td colspan=2>";
- echo "</td></tr>";
-
-
+
echo "<tr class='tab_bg_1'><td>".$lang["common"][5].": </td><td>";
dropdownValue("glpi_enterprises","FK_glpi_enterprise",$comp->fields["FK_glpi_enterprise"]);
echo "</td>";
diff -Nur web/glpi/glpi/glpi/computers/functions.php~ glpi/glpi/computers/functions.php~
--- web/glpi/glpi/glpi/computers/functions.php~ 2005-03-07 11:25:12.000000000 +0100
+++ glpi/glpi/computers/functions.php~ 1970-01-01 01:00:00.000000000 +0100
@@ -1,791 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
-*/
-
-// Based on:
-// IRMA, Information Resource-Management and Administration
-// Christian Bauer
-// ----------------------------------------------------------------------
-// Original Author of file:
-// Purpose of file:
-// ----------------------------------------------------------------------
-
-include ("_relpos.php");
-// FUNCTIONS Computers
-
-function titleComputers(){
- //titre
-
- GLOBAL $lang,$HTMLRel;
-
- echo "<div align='center'><table border='0'><tr><td>";
- echo "<img src=\"".$HTMLRel."pics/computer.png\" alt='".$lang["computers"][0]."' title='".$lang["computers"][0]."'></td><td><a class='icon_consol' href=\"computers-add-select.php\"><b>".$lang["computers"][0]."</b></a>";
- echo "</td>";
- echo "<td><a href='".$HTMLRel."setup/setup-templates.php?type=".COMPUTER_TYPE."'>".$lang["common"][8]."</a></td>";
- echo "</tr></table></div>";
-
-}
-
-
-
-function searchFormComputers($field="",$contains="",$sort= "",$deleted= "") {
- // Print Search Form
-
- GLOBAL $cfg_install, $cfg_layout, $layout, $lang,$HTMLRel;
-
-
- $option["comp.ID"] = $lang["computers"][31];
- $option["comp.name"] = $lang["computers"][7];
- $option["glpi_dropdown_locations.name"] = $lang["computers"][10];
- $option["glpi_type_computers.name"] = $lang["computers"][8];
- $option["glpi_dropdown_os.name"] = $lang["computers"][9];
- //$option["comp.osver"] = $lang["computers"][20];
- $option["processor.designation"] = $lang["computers"][21];
- //$option["processorspeed"] = $lang["computers"][22];
- $option["comp.serial"] = $lang["computers"][17];
- $option["comp.otherserial"] = $lang["computers"][18];
- $option["ram.designation"] = $lang["computers"][23];
- //$option["comp.ram"] = $lang["computers"][24];
- $option["iface.designation"] = $lang["computers"][26];
- //$option["comp.hdspace"] = $lang["computers"][25];
- $option["sndcard.designation"] = $lang["computers"][33];
- $option["gfxcard.designation"] = $lang["computers"][34];
- $option["moboard.designation"] = $lang["computers"][35];
- $option["hdd.designation"] = $lang["computers"][36];
- $option["comp.comments"] = $lang["computers"][19];
- $option["comp.contact"] = $lang["computers"][16];
- $option["comp.contact_num"] = $lang["computers"][15];
- $option["comp.date_mod"] = $lang["computers"][11];
- $option["glpi_networking_ports.ifaddr"] = $lang["networking"][14];
- $option["glpi_networking_ports.ifmac"] = $lang["networking"][15];
- $option["glpi_dropdown_netpoint.name"] = $lang["networking"][51];
- $option["glpi_enterprises.name"] = $lang["common"][5];
-
- echo "<form method=get action=\"".$cfg_install["root"]."/computers/computers-search.php\">";
- echo "<div align='center'><table border='0' width='750' class='tab_cadre'>";
- echo "<tr><th colspan='3'><b>".$lang["search"][0].":</b></th></tr>";
- echo "<tr class='tab_bg_1'>";
- echo "<td align='center'>";
- echo "<select name=\"field\" size='1'>";
- echo "<option value='all' ";
- if($field == "all") echo "selected";
- echo ">".$lang["search"][7]."</option>";
- reset($option);
- foreach ($option as $key => $val) {
- echo "<option value=\"".$key."\"";
- if($key == $field) echo "selected";
- echo ">". $val ."</option>\n";
- }
- echo "</select> ";
- echo " ";
- echo "<input type='text' size='15' name=\"contains\" value=\"". $contains ."\" />";
- echo " ";
- echo $lang["search"][4];
- echo " <select name='sort' size='1'>";
- reset($option);
- foreach ($option as $key => $val) {
- echo "<option value=\"".$key."\"";
- if($key == $sort) echo "selected";
- echo ">".$val."</option>\n";
- }
- echo "</select> ";
- echo "</td><td><input type='checkbox' name='deleted' ".($deleted=='Y'?" checked ":"").">";
- echo "<img src=\"".$HTMLRel."pics/showdeleted.png\" alt='".$lang["common"][3]."' title='".$lang["common"][3]."'>";
- echo "</td><td width='80' align='center' class='tab_bg_2'>";
- echo "<input type='submit' value=\"".$lang["buttons"][0]."\" class='submit' />";
- echo "</td></tr></table></div></form>";
-
-
-}
-
-function IsDropdown($field) {
- $dropdown = array("netpoint","os");
- if(in_array($field,$dropdown)) {
- return true;
- }
- else {
- return false;
- }
-}
-
-function IsDevice($field) {
- global $cfg_devices_tables;
- if(in_array($field,$cfg_devices_tables)) {
- return true;
- }
- else {
- return false;
- }
-}
-
-function showComputerList($target,$username,$field,$contains,$sort,$order,$start,$deleted) {
-
- $db = new DB;
- // Lists Computers
-
- GLOBAL $cfg_install, $cfg_layout, $cfg_features, $lang,$HTMLRel, $cfg_devices_tables;
-
-
- // Build query
- if($field == "all") {
- $where = " (";
- $query = "SHOW COLUMNS FROM glpi_computers";
- $result = $db->query($query);
- $i = 0;
- while($line = $db->fetch_array($result)) {
- if($i != 0) {
- $where .= " OR ";
- }
- if(IsDropdown($line["Field"])) {
- $where .= " glpi_dropdown_". $line["Field"] .".name LIKE '%".$contains."%'";
- }
- elseif($line["Field"] == "location") {
- $where .= " glpi_dropdown_locations.name LIKE '%".$contains."%'";
- }
- else {
- $where .= "comp.".$line["Field"] . " LIKE '%".$contains."%'";
- }
- $i++;
- }
- foreach($cfg_devices_tables as $key => $val) {
- $where .= " OR ".$val.".designation LIKE '%".$contains."%'";
- }
- $where .= " OR glpi_networking_ports.ifaddr LIKE '%".$contains."%'";
- $where .= " OR glpi_networking_ports.ifmac LIKE '%".$contains."%'";
- $where .= " OR glpi_dropdown_netpoint.name LIKE '%".$contains."%'";
- $where .= " OR glpi_enterprises.name LIKE '%".$contains."%'";
- $where .= ")";
- }
- else {
- if(IsDevice($field)) {
- $where = "(glpi_device_".$field." LIKE '%".$contains."')";
- }
- else {
- $where = "($field LIKE '%".$contains."%')";
- }
- }
- if (!$start) {
- $start = 0;
- }
- if (!$order) {
- $order = "ASC";
- }
- $query = "select DISTINCT comp.ID from glpi_computers as comp LEFT JOIN glpi_computer_device as gcdev ON (comp.ID = gcdev.FK_computers) ";
- $query.= "LEFT JOIN glpi_device_moboard as moboard ON (moboard.ID = gcdev.FK_device AND gcdev.device_type = '".MOBOARD_DEVICE."') ";
- $query.= "LEFT JOIN glpi_device_processor as processor ON (processor.ID = gcdev.FK_device AND gcdev.device_type = '".PROCESSOR_DEVICE."') ";
- $query.= "LEFT JOIN glpi_device_gfxcard as gfxcard ON (gfxcard.ID = gcdev.FK_DEVICE AND gcdev.device_type = '".GFX_DEVICE."') ";
- $query.= "LEFT JOIN glpi_device_hdd as hdd ON (hdd.ID = gcdev.FK_DEVICE AND gcdev.device_type = '".HDD_DEVICE."') ";
- $query.= "LEFT JOIN glpi_device_iface as iface ON (iface.ID = gcdev.FK_DEVICE AND gcdev.device_type = '".NETWORK_DEVICE."') ";
- $query.= "LEFT JOIN glpi_device_ram as ram ON (ram.ID = gcdev.FK_DEVICE AND gcdev.device_type = '".RAM_DEVICE."') ";
- $query.= "LEFT JOIN glpi_device_sndcard as sndcard ON (sndcard.ID = gcdev.FK_DEVICE AND gcdev.device_type = '".SND_DEVICE."') ";
- $query.= "LEFT JOIN glpi_networking_ports on (comp.ID = glpi_networking_ports.on_device AND glpi_networking_ports.device_type='1')";
- $query.= "LEFT JOIN glpi_dropdown_netpoint on (glpi_dropdown_netpoint.ID = glpi_networking_ports.netpoint)";
- $query.= "LEFT JOIN glpi_dropdown_os on (glpi_dropdown_os.ID = comp.os)";
- $query.= "LEFT JOIN glpi_dropdown_locations on (glpi_dropdown_locations.ID = comp.location)";
- $query.= " LEFT JOIN glpi_enterprises ON (glpi_enterprises.ID = comp.FK_glpi_enterprise ) ";
- $query .= " where $where AND comp.deleted='$deleted' AND comp.is_template = '0' ORDER BY $sort $order";
- // Get it from database
- if ($result = $db->query($query)) {
- $numrows= $db->numrows($result);
-
- // Limit the result, if no limit applies, use prior result
- if ($numrows>$cfg_features["list_limit"]) {
- $query_limit = $query. " LIMIT $start,".$cfg_features["list_limit"]." ";
- $result_limit = $db->query($query_limit);
- $numrows_limit = $db->numrows($result_limit);
- } else {
- $numrows_limit = $numrows;
- $result_limit = $result;
- }
-
- if ($numrows_limit>0) {
- // Produce headline
- echo "<div align='center'><table border='0' class='tab_cadre'><tr>";
-
- // Name
- echo "<th>";
- if ($sort=="comp.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&contains=$contains&sort=comp.name&order=ASC&start=$start\">";
- echo $lang["computers"][7]."</a></th>";
-
- // Manufacturer
- echo "<th>";
- if ($sort=="glpi_enterprises.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&contains=$contains&sort=glpi_enterprises.name&order=ASC&start=$start\">";
- echo $lang["common"][5]."</a></th>";
-
- // Serial
- echo "<th>";
- if ($sort=="comp.serial") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&contains=$contains&sort=comp.serial&order=ASC&start=$start\">";
- echo $lang["computers"][6]."</a></th>";
-
-
- // Type
- echo "<th>";
- if ($sort=="glpi_type_computers.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&contains=$contains&sort=glpi_type_computers.name&order=ASC&start=$start\">";
- echo $lang["computers"][8]."</a></th>";
-
- // OS
- echo "<th>";
- if ($sort=="glpi_dropdown_os.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&contains=$contains&sort=glpi_dropdown_os.name&order=ASC&start=$start\">";
- echo $lang["computers"][9]."</a></th>";
-
- // Location
- echo "<th>";
- if ($sort=="glpi_dropdown_locations.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&contains=$contains&sort=glpi_dropdown_locations.name&order=ASC&start=$start\">";
- echo $lang["computers"][10]."</a></th>";
-
- // Last modified
- echo "<th>";
- if ($sort=="date_mod") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&contains=$contains&sort=date_mod&order=DESC&start=$start\">";
- echo $lang["computers"][11]."</a></th>";
-
- // Contact person
- echo "<th>";
- if ($sort=="contact") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&contains=$contains&sort=contact&order=ASC&start=$start\">";
- echo $lang["computers"][16]."</a></th>";
-
- echo "</tr>";
-
- for ($i=0; $i < $numrows_limit; $i++) {
- $ID = $db->result($result_limit, $i, "ID");
- $comp = new Computer;
- $comp->getfromDB($ID,0);
- echo "<tr class='tab_bg_2'>";
- echo "<td><b>";
- echo "<a href=\"".$cfg_install["root"]."/computers/computers-info-form.php?ID=$ID\">";
- echo $comp->fields["name"]." (".$comp->fields["ID"].")";
- echo "</a></b></td>";
- echo "<td>". getDropdownName("glpi_enterprises",$comp->fields["FK_glpi_enterprise"]) ."</td>";
- echo "<td>".$comp->fields["serial"]."</td>";
- echo "<td>". getDropdownName("glpi_type_computers",$comp->fields["type"]) ."</td>";
- echo "<td>". getDropdownName("glpi_dropdown_os",$comp->fields["os"]) ."</td>";
- echo "<td>". getDropdownName("glpi_dropdown_locations", $comp->fields["location"]) ."</td>";
- echo "<td>".$comp->fields["date_mod"]."</td>";
- echo "<td>".$comp->fields["contact"]."</td>";
-
- echo "</tr>";
- }
-
- // Close Table
- echo "</table></div>";
-
- // Pager
- $parameters="field=$field&contains=$contains&sort=$sort";
- printPager($start,$numrows,$target,$parameters);
-
- } else {
- echo "<div align='center'><b>".$lang["computers"][32]."</b></div>";
- echo "<hr noshade>";
- }
- }
-}
-
-function showComputerForm($target,$ID,$withtemplate='') {
- global $lang,$HTMLRel;;
- $comp = new Computer;
- $computer_spotted = false;
- if(empty($ID) && $withtemplate == 1) {
- if($comp->getEmpty()) $computer_spotted = true;
- } else {
- if($comp->getfromDB($ID)) $computer_spotted = true;
- }
- if($computer_spotted) {
- if(!empty($withtemplate) && $withtemplate == 2) {
- $template = "newcomp";
- $datestring = $lang["computers"][14].": ";
- $date = date("Y-m-d H:i:s");
- } elseif(!empty($withtemplate) && $withtemplate == 1) {
- $template = "newtemplate";
- $datestring = $lang["computers"][14].": ";
- $date = date("Y-m-d H:i:s");
- } else {
- $datestring = $lang["computers"][11]." : ";
- $date = $comp->fields["date_mod"];
- $template = false;
- }
-
- echo "<form name='form' method='post' action=\"$target\">";
- if(strcmp($template,"newtemplate") === 0) {
- echo "<input type=\"hidden\" name=\"is_template\" value=\"1\" />";
- }
- echo "<div align='center'>";
- echo "<table width='700px' class='tab_cadre' >";
- echo "<tr><th colspan ='2' align='center' >";
- if(!$template) {
- echo $lang["computers"][13].": ".$comp->fields["ID"];
- }elseif (strcmp($template,"newcomp") === 0) {
- echo $lang["computers"][12].": ".$comp->fields["tplname"];
- }elseif (strcmp($template,"newtemplate") === 0) {
- echo $lang["common"][6]." : <input type='text' name='tplname' value=\"".$comp->fields["tplname"]."\" size='20'>";
- }
-
- echo "</th><th colspan ='2' align='center'>".$datestring.$date;
- echo "</th></tr>";
-
- echo "<tr class='tab_bg_1'><td>".$lang["computers"][7]." : </td>";
- echo "<td><input type='text' name='name' value=\"".$comp->fields["name"]."\" size='20'></td>";
-
- echo "<td>".$lang["computers"][16]." : </td><td><input type='text' name='contact' size='20' value=\"".$comp->fields["contact"]."\">";
- echo "</tr>";
-
- echo "<tr class='tab_bg_1'>";
-
- echo "<td >".$lang["computers"][10]." : </td>";
- echo "<td >";
- dropdownValue("glpi_dropdown_locations", "location", $comp->fields["location"]);
-
- echo "</td>";
-
-
-
- echo "<td>".$lang["computers"][15]." : </td><td><input type='text' name='contact_num' value=\"".$comp->fields["contact_num"]."\" size='20'></td></tr>";
- echo "<tr class='tab_bg_1'>";
- echo "<td >".$lang["computers"][50]." : </td>";
- echo "<td >";
- dropdownValue("glpi_contacts", "tech_num", $comp->fields["tech_num"]);
-
- echo "</td>";
- echo "<td colspan=2>";
- echo "</td></tr>";
-
-
- echo "<tr class='tab_bg_1'><td>".$lang["common"][5].": </td><td>";
- dropdownValue("glpi_enterprises","FK_glpi_enterprise",$comp->fields["FK_glpi_enterprise"]);
- echo "</td>";
-
- echo "<td valign='center' rowspan='4'>".$lang["computers"][19]." :</td><td valign='center' rowspan='4'><textarea cols='35' rows='6' name='comments' >".$comp->fields["comments"]."</textarea></td></tr>";
- echo "<tr class='tab_bg_1'><td>".$lang["computers"][18]." : </td>";
- echo "<td><input type='text' size='20' name='otherserial' value=\"".$comp->fields["otherserial"]."\">";
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_1'><td>".$lang["computers"][17]." : </td>";
- echo "<td><input type='text' name='serial' size='20' value=\"".$comp->fields["serial"]."\">";
- echo "</td></tr>";
-
-
- echo "<tr class='tab_bg_1'>";
-
-
-
- echo "<td>".$lang["computers"][27].": </td>";
-
- // Is Server?
- echo "<td>";
- if (isset($comp->fields["flags_server"]))
- {
- if($comp->fields["flags_server"] == 1)
- {
- echo "<input type='checkbox' name='flags_server' value='1' checked>";
- }
- else
- {
- echo "<input type='checkbox' name='flags_server' value='1'>";
- }
- }
- else
- {
- echo "<input type='checkbox' name='flags_server' value='1'>";
- }
- echo " ".$lang["computers"][28]."</td>";
-
- echo "</tr>";
-
-
-
- echo "<tr class='tab_bg_1'>";
-
- echo "<td>".$lang["computers"][9]." </td><td>";
- dropdownValue("glpi_dropdown_os", "os", $comp->fields["os"]);
- echo "</td>";
- echo $template;
- if (!$template){
- echo "<td>".$lang["reservation"][24]." :</td><td><b>";
- showReservationForm(COMPUTER_TYPE,$ID);
- echo "</b></td>";
- } else echo "<td> </td><td> </td>";
-
-
-
-
-
- echo "</tr><tr>";
- if ($template) {
- if (empty($ID)||$withtemplate==2){
- echo "<td class='tab_bg_2' align='center' colspan='4'>\n";
- echo "<input type='hidden' name='ID' value=$ID>";
- echo "<input type='submit' name='add' value=\"".$lang["buttons"][8]."\" class='submit'>";
- echo "</td>\n";
- } else {
- echo "<td class='tab_bg_2' align='center' colspan='4'>\n";
- echo "<input type='hidden' name='ID' value=$ID>";
- echo "<input type='submit' name='update' value=\"".$lang["buttons"][7]."\" class='submit'>";
- echo "</td>\n";
- }
- } else {
- echo "<td class='tab_bg_2' colspan='2' align='center' valign='top'>\n";
- echo "<input type='submit' name='update' value=\"".$lang["buttons"][7]."\" class='submit'>";
- echo "</td>\n";
- echo "<td class='tab_bg_2' colspan='2' align='center'>\n";
- echo "<input type='hidden' name='ID' value=$ID>";
- echo "<div align='center'>";
- if ($comp->fields["deleted"]=='N')
- echo "<input type='submit' name='delete' value=\"".$lang["buttons"][6]."\" class='submit'>";
- else {
- echo "<input type='submit' name='restore' value=\"".$lang["buttons"][21]."\" class='submit'>";
-
- echo " <input type='submit' name='purge' value=\"".$lang["buttons"][22]."\" class='submit'>";
- }
- echo "</div>";
- echo "</td>";
- }
-
- echo "</tr>\n";
-
-
-
- echo "</table>";
- echo "</div>";
-
- echo "</form>";
-
-
- if (!empty($ID)){
- //print devices.
- echo "<div align='center'>";
- echo "<table width='700' class='tab_cadre' >";
- echo "<tr><th colspan='64'>".$lang["devices"][10]."</th></tr>";
- foreach($comp->devices as $key => $val) {
- $devType = $val["devType"];
- $devID = $val["devID"];
- $specif = $val["specificity"];
- $compDevID = $val["compDevID"];
- $device = new Device($devType);
- $device->getFromDB($devID);
- printDeviceComputer(&$device,$specif,$comp->fields["ID"],$compDevID,$withtemplate);
-
- echo "</div>";
- }
- //ADD a new device form.
- device_selecter($_SERVER["PHP_SELF"],$comp->fields["ID"],$withtemplate);
- echo "</table></div>";
- }
- return true;
- }
- else {
- echo "<div align='center'><b>".$lang["computers"][32]."</b></div>";
- echo "<hr noshade>";
- searchFormComputers();
- return false;
- }
-}
-
-function updateComputer($input) {
- // Update a computer in the database
-
- $comp = new Computer;
- $comp->getFromDB($input["ID"],0);
-
- // set new date and make sure it gets updated
- $updates[0]= "date_mod";
- $comp->fields["date_mod"] = date("Y-m-d H:i:s");
-
- // Pop off the last two attributes, no longer needed
- $null=array_pop($input);
- $null=array_pop($input);
-
- // Get all flags and fill with 0 if unchecked in form
- foreach ($comp->fields as $key => $val) {
- if (eregi("\.*flag\.*",$key)) {
- if (empty($input[$key])) {
- $input[$key]=0;
- }
- }
- }
-
- // Fill the update-array with changes
- $x=1;
- foreach ($input as $key => $val) {
- if (empty($comp->fields[$key]) || $comp->fields[$key] != $input[$key]) {
- $comp->fields[$key] = $input[$key];
- $updates[$x] = $key;
- $x++;
- }
- }
- $comp->updateInDB($updates);
-}
-
-function addComputer($input) {
- // Add Computer
- $db=new DB;
- $comp = new Computer;
-
- // set new date.
- $comp->fields["date_mod"] = date("Y-m-d H:i:s");
-
- // dump status
- $oldID=$input["ID"];
- $null=array_pop($input);
- $null=array_pop($input);
- $null=array_pop($input);
-
- $i=0;
- // fill array for update
- foreach ($input as $key => $val){
- if (!isset($comp->fields[$key]) || $comp->fields[$key] != $input[$key]) {
- $comp->fields[$key] = $input[$key];
- }
- }
- $comp->addToDB();
-
- $newID=$comp->getInsertElementID();
-
- // ADD Devices
- $comp->getFromDB($oldID);
- foreach($comp->devices as $key => $val) {
- compdevice_add($newID,$val["devType"],$val["devID"],$val["specificity"]);
- }
-
- // ADD Infocoms
- $ic= new Infocom();
- if ($ic->getFromDB(COMPUTER_TYPE,$oldID)){
- $ic->fields["FK_device"]=$newID;
- unset ($ic->fields["ID"]);
- $ic->addToDB();
- }
-
- // ADD software
- $query="SELECT license from glpi_inst_software WHERE cID='$oldID'";
- $result=$db->query($query);
- if ($db->numrows($result)>0){
-
- while ($data=$db->fetch_array($result))
- installSoftware($newID,$data['license']);
- }
-
- // ADD Contract
- $query="SELECT FK_contract from glpi_contract_device WHERE FK_device='$oldID' AND device_type='".COMPUTER_TYPE."';";
- $result=$db->query($query);
- if ($db->numrows($result)>0){
-
- while ($data=$db->fetch_array($result))
- addDeviceContract($data["FK_contract"],COMPUTER_TYPE,$newID);
- }
-
- // ADD Ports
- $query="SELECT ID from glpi_networking_ports WHERE on_device='$oldID' AND device_type='".COMPUTER_TYPE."';";
- $result=$db->query($query);
- if ($db->numrows($result)>0){
-
- while ($data=$db->fetch_array($result)){
- $np= new Netport();
- $np->getFromDB($data["ID"]);
- unset($np->fields["ID"]);
- unset($np->fields["ifaddr"]);
- unset($np->fields["ifmac"]);
- unset($np->fields["netpoint"]);
- $np->fields["on_device"]=$newID;
- $np->addToDB();
- }
- }
-
-
-}
-
-function deleteComputer($input,$force=0) {
- // Delete Computer
-
- $comp = new Computer;
- $comp->deleteFromDB($input["ID"],$force);
-}
-
-function restoreComputer($input) {
- // Restore Computer
-
- $ct = new Computer;
- $ct->restoreInDB($input["ID"]);
-}
-
-function showConnections($ID,$withtemplate='') {
-
- GLOBAL $cfg_layout, $cfg_install, $lang;
-
- $db = new DB;
-
- echo "<div align='center'><table border='0' width='90%' class='tab_cadre'>";
- echo "<tr><th colspan='3'>".$lang["connect"][0].":</th></tr>";
- echo "<tr><th>".$lang["computers"][39].":</th><th>".$lang["computers"][40].":</th><th>".$lang["computers"][46].":</th></tr>";
-
- echo "<tr class='tab_bg_1'>";
-
- // Printers
- echo "<td align='center'>";
- $query = "SELECT * from glpi_connect_wire WHERE end2='$ID' AND type='".PRINTER_TYPE."'";
- if ($result=$db->query($query)) {
- $resultnum = $db->numrows($result);
- if ($resultnum>0) {
- echo "<table width='100%'>";
- for ($i=0; $i < $resultnum; $i++) {
- $tID = $db->result($result, $i, "end1");
- $printer = new Printer;
- $printer->getfromDB($tID);
- echo "<tr ".($printer->fields["deleted"]=='Y'?"class='tab_bg_2_2'":"").">";
- echo "<td align='center'><a href=\"".$cfg_install["root"]."/printers/printers-info-form.php?ID=$tID\"><b>";
- echo $printer->fields["name"]." (".$printer->fields["ID"].")";
- echo "</b></a></td>";
- if(!empty($withtemplate) && $withtemplate == 2) {
- //do nothing
- } else {
- echo "<td align='center'><a href=\"".$cfg_install["root"]."/computers/computers-info-form.php?cID=$ID&eID=$tID&disconnect=1&device_type=".PRINTER_TYPE."&withtemplate=".$withtemplate."\"><b>";
- echo $lang["buttons"][10];
- echo "</b></a></td>";
- }
- echo "</tr>";
- }
- echo "</table>";
- } else {
- echo $lang["computers"][38]."<br>";
- }
- if(!empty($withtemplate) && $withtemplate == 2) {
- //do nothing
- } else {
- echo "<a href=\"".$cfg_install["root"]."/computers/computers-info-form.php?ID=$ID&connect=1&device_type=printer&withtemplate=".$withtemplate."\"><b>";
- echo $lang["buttons"][9];
- echo "</b></a>";
- }
-
- }
- echo "</td>";
-
- // Monitors
- echo "<td align='center'>";
- $query = "SELECT * from glpi_connect_wire WHERE end2='$ID' AND type='".MONITOR_TYPE."'";
- if ($result=$db->query($query)) {
- $resultnum = $db->numrows($result);
- if ($resultnum>0) {
- echo "<table width='100%'>";
- for ($i=0; $i < $resultnum; $i++) {
- $tID = $db->result($result, $i, "end1");
- $monitor = new Monitor;
- $monitor->getfromDB($tID);
- echo "<tr ".($monitor->fields["deleted"]=='Y'?"class='tab_bg_2_2'":"").">";
- echo "<td align='center'><a href=\"".$cfg_install["root"]."/monitors/monitors-info-form.php?ID=$tID\"><b>";
- echo $monitor->fields["name"]." (".$monitor->fields["ID"].")";
- echo "</b></a></td>";
- if(!empty($withtemplate) && $withtemplate == 2) {
- //do nothing
- } else {
- echo "<td align='center'><a href=\"".$cfg_install["root"]."/computers/computers-info-form.php?cID=$ID&eID=$tID&disconnect=1&device_type=".MONITOR_TYPE."&withtemplate=".$withtemplate."\"><b>";
- echo $lang["buttons"][10];
- echo "</b></a></td>";
- }
- echo "</tr>";
- }
- echo "</table>";
- } else {
- echo $lang["computers"][37]."<br>";
- }
- if(!empty($withtemplate) && $withtemplate == 2) {
- //do nothing
- } else {
- echo "<a href=\"".$cfg_install["root"]."/computers/computers-info-form.php?ID=$ID&connect=1&device_type=monitor&withtemplate=".$withtemplate."\"><b>";
- echo $lang["buttons"][9];
- echo "</b></a>";
- }
-
- }
- echo "</td>";
-
- //Peripherals
- echo "<td align='center'>";
- $query = "SELECT * from glpi_connect_wire WHERE end2='$ID' AND type='".PERIPHERAL_TYPE."'";
- if ($result=$db->query($query)) {
- $resultnum = $db->numrows($result);
- if ($resultnum>0) {
- echo "<table width='100%'>";
- for ($i=0; $i < $resultnum; $i++) {
- $tID = $db->result($result, $i, "end1");
- $periph = new Peripheral;
- $periph->getfromDB($tID);
- echo "<tr ".($periph->fields["deleted"]=='Y'?"class='tab_bg_2_2'":"").">";
- echo "<td align='center'><a href=\"".$cfg_install["root"]."/peripherals/peripherals-info-form.php?ID=$tID\"><b>";
- echo $periph->fields["name"]." (".$periph->fields["ID"].")";
- echo "</b></a></td>";
- if(!empty($withtemplate) && $withtemplate == 2) {
- //do nothing
- } else {
- echo "<td align='center'><a href=\"".$cfg_install["root"]."/computers/computers-info-form.php?cID=$ID&eID=$tID&disconnect=1&device_type=".PERIPHERAL_TYPE."&withtemplate=".$withtemplate."\"><b>";
- echo $lang["buttons"][10];
- echo "</b></a></td>";
- }
- echo "</tr>";
- }
- echo "</table>";
- } else {
- echo $lang["computers"][47]."<br>";
- }
- if(!empty($withtemplate) && $withtemplate == 2) {
- //do nothing
- } else {
- echo "<a href=\"".$cfg_install["root"]."/computers/computers-info-form.php?ID=$ID&connect=1&device_type=peripheral&withtemplate=".$withtemplate."\"><b>";
- echo $lang["buttons"][9];
- echo "</b></a>";
- }
-
- }
-
- echo "</tr>";
- echo "</table></div><br>";
-
-}
-
-
-
-
-?>
diff -Nur web/glpi/glpi/glpi/computers/.#functions.php.1.72 glpi/glpi/computers/.#functions.php.1.72
--- web/glpi/glpi/glpi/computers/.#functions.php.1.72 2005-03-04 14:50:25.000000000 +0100
+++ glpi/glpi/computers/.#functions.php.1.72 1970-01-01 01:00:00.000000000 +0100
@@ -1,731 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
-*/
-
-// Based on:
-// IRMA, Information Resource-Management and Administration
-// Christian Bauer
-// ----------------------------------------------------------------------
-// Original Author of file:
-// Purpose of file:
-// ----------------------------------------------------------------------
-
-include ("_relpos.php");
-// FUNCTIONS Computers
-
-function titleComputers(){
- //titre
-
- GLOBAL $lang,$HTMLRel;
-
- echo "<div align='center'><table border='0'><tr><td>";
- echo "<img src=\"".$HTMLRel."pics/computer.png\" alt='".$lang["computers"][0]."' title='".$lang["computers"][0]."'></td><td><a class='icon_consol' href=\"computers-add-select.php\"><b>".$lang["computers"][0]."</b></a>";
- echo "</td></tr></table></div>";
-
-}
-
-
-
-function searchFormComputers($field="",$phrasetype= "",$contains="",$sort= "",$deleted= "") {
- // Print Search Form
-
- GLOBAL $cfg_install, $cfg_layout, $layout, $lang,$HTMLRel;
-
-
- $option["comp.ID"] = $lang["computers"][31];
- $option["comp.name"] = $lang["computers"][7];
- $option["glpi_dropdown_locations.name"] = $lang["computers"][10];
- $option["glpi_type_computers.name"] = $lang["computers"][8];
- $option["glpi_dropdown_os.name"] = $lang["computers"][9];
- $option["comp.osver"] = $lang["computers"][20];
- $option["comp.processor"] = $lang["computers"][21];
- $option["comp.processor_speed"] = $lang["computers"][22];
- $option["comp.serial"] = $lang["computers"][17];
- $option["comp.otherserial"] = $lang["computers"][18];
- $option["glpi_dropdown.ram.name"] = $lang["computers"][23];
- $option["comp.ram"] = $lang["computers"][24];
- $option["glpi_dropdown_network.name"] = $lang["computers"][26];
- $option["comp.hdspace"] = $lang["computers"][25];
- $option["glpi_dropdown_sndcard.name"] = $lang["computers"][33];
- $option["glpi_dropdown_gfxcard.name"] = $lang["computers"][34];
- $option["glpi_dropdown_moboard.name"] = $lang["computers"][35];
- $option["glpi_dropdown_hdtype.name"] = $lang["computers"][36];
- $option["comp.comments"] = $lang["computers"][19];
- $option["comp.contact"] = $lang["computers"][16];
- $option["comp.contact_num"] = $lang["computers"][15];
- $option["comp.date_mod"] = $lang["computers"][11];
- $option["glpi_networking_ports.ifaddr"] = $lang["networking"][14];
- $option["glpi_networking_ports.ifmac"] = $lang["networking"][15];
- $option["glpi_dropdown_netpoint.name"] = $lang["networking"][51];
- $option["glpi_enterprises.name"] = $lang["common"][5];
-
- echo "<form method=get action=\"".$cfg_install["root"]."/computers/computers-search.php\">";
- echo "<div align='center'><table border='0' width='750' class='tab_cadre'>";
- echo "<tr><th colspan='3'><b>".$lang["search"][0].":</b></th></tr>";
- echo "<tr class='tab_bg_1'>";
- echo "<td align='center'>";
- echo "<select name=\"field\" size='1'>";
- echo "<option value='all' ";
- if($field == "all") echo "selected";
- echo ">".$lang["search"][7]."</option>";
- reset($option);
- foreach ($option as $key => $val) {
- echo "<option value=\"".$key."\"";
- if($key == $field) echo "selected";
- echo ">". $val ."</option>\n";
- }
- echo "</select> ";
- echo $lang["search"][1];
- echo " <select name='phrasetype' size='1' >";
- echo "<option value='contains'";
- if($phrasetype == "contains") echo "selected";
- echo ">".$lang["search"][2]."</option>";
- echo "<option value='exact'";
- if($phrasetype == "exact") echo "selected";
- echo ">".$lang["search"][3]."</option>";
- echo "</select>";
- echo "<input type='text' size='15' name=\"contains\" value=\"". $contains ."\" />";
- echo " ";
- echo $lang["search"][4];
- echo " <select name='sort' size='1'>";
- reset($option);
- foreach ($option as $key => $val) {
- echo "<option value=\"".$key."\"";
- if($key == $sort) echo "selected";
- echo ">".$val."</option>\n";
- }
- echo "</select> ";
- echo "</td><td><input type='checkbox' name='deleted' ".($deleted=='Y'?" checked ":"").">";
- echo "<img src=\"".$HTMLRel."pics/showdeleted.png\" alt='".$lang["common"][3]."' title='".$lang["common"][3]."'>";
- echo "</td><td width='80' align='center' class='tab_bg_2'>";
- echo "<input type='submit' value=\"".$lang["buttons"][0]."\" class='submit' />";
- echo "</td></tr></table></div></form>";
-
-
-}
-
-function IsDropdown($field) {
- $dropdown = array("hdtype","sndcard","moboard","gfxcard","network","processor","os");
- if(in_array($field,$dropdown)) {
- return true;
- }
- else {
- return false;
- }
-}
-
-function showComputerList($target,$username,$field,$phrasetype,$contains,$sort,$order,$start,$deleted) {
-
-
- $db = new DB;
- // Lists Computers
-
- GLOBAL $cfg_install, $cfg_layout, $cfg_features, $lang,$HTMLRel;
-
-
- // Build query
- if($field == "all") {
- $where = " (";
- $fields = $db->list_fields("glpi_computers");
- $columns = $db->num_fields($fields);
-
- for ($i = 0; $i < $columns; $i++) {
- if($i != 0) {
- $where .= " OR ";
- }
- $coco = mysql_field_name($fields, $i);
- if(IsDropdown($coco)) {
- $where .= " glpi_dropdown_". $coco .".name LIKE '%".$contains."%'";
- }
- elseif($coco == "ramtype") {
- $where .= " glpi_dropdown_ram.name LIKE '%".$contains."%'";
- }
- elseif($coco == "location") {
- $where .= " glpi_dropdown_locations.name LIKE '%".$contains."%'";
- }
- elseif($coco == "type") {
- $where .= " glpi_type_computers.name LIKE '%".$contains."%'";
- }
- else {
- $where .= "comp.".$coco . " LIKE '%".$contains."%'";
- }
- }
- $where .= " OR glpi_networking_ports.ifaddr LIKE '%".$contains."%'";
- $where .= " OR glpi_networking_ports.ifmac LIKE '%".$contains."%'";
- $where .= " OR glpi_dropdown_netpoint.name LIKE '%".$contains."%'";
- $where.=" OR glpi_enterprises.name LIKE '%".$contains."%'";
- $where .= ")";
- }
- else {
- if ($phrasetype == "contains") {
- $where = "($field LIKE '%".$contains."%')";
- }
- else {
- $where = "($field LIKE '".$contains."')";
- }
- }
- if (!$start) {
- $start = 0;
- }
- if (!$order) {
- $order = "ASC";
- }
- $query = "select DISTINCT comp.ID from glpi_computers as comp LEFT JOIN glpi_dropdown_locations on comp.location=glpi_dropdown_locations.ID ";
- $query .= "LEFT JOIN glpi_dropdown_os on comp.os=glpi_dropdown_os.ID LEFT JOIN glpi_type_computers on comp.type = glpi_type_computers.ID ";
- $query .= "LEFT JOIN glpi_dropdown_hdtype on comp.hdtype = glpi_dropdown_hdtype.ID LEFT JOIN glpi_dropdown_processor on comp.processor = glpi_dropdown_processor.ID ";
- $query .= "LEFT JOIN glpi_dropdown_ram on comp.ramtype = glpi_dropdown_ram.ID LEFT JOIN glpi_dropdown_network on comp.network = glpi_dropdown_network.ID ";
- $query .= "LEFT JOIN glpi_dropdown_gfxcard on comp.gfxcard = glpi_dropdown_gfxcard.ID LEFT JOIN glpi_dropdown_moboard on comp.moboard = glpi_dropdown_moboard.ID ";
- $query .= "LEFT JOIN glpi_dropdown_sndcard on comp.sndcard = glpi_dropdown_sndcard.ID ";
- $query .= "LEFT JOIN glpi_networking_ports on (comp.ID = glpi_networking_ports.on_device AND glpi_networking_ports.device_type='1')";
- $query .= "LEFT JOIN glpi_dropdown_netpoint on (glpi_dropdown_netpoint.ID = glpi_networking_ports.netpoint)";
- $query.= " LEFT JOIN glpi_enterprises ON (glpi_enterprises.ID = comp.FK_glpi_enterprise ) ";
- $query .= " where $where AND comp.deleted='$deleted' ORDER BY $sort $order";
- //$query = "SELECT * FROM glpi_computers WHERE $where ORDER BY $sort $order";
-//echo $query;
- // Get it from database
- if ($result = $db->query($query)) {
- $numrows= $db->numrows($result);
-
- // Limit the result, if no limit applies, use prior result
- if ($numrows>$cfg_features["list_limit"]) {
- $query_limit = $query. " LIMIT $start,".$cfg_features["list_limit"]." ";
- $result_limit = $db->query($query_limit);
- $numrows_limit = $db->numrows($result_limit);
- } else {
- $numrows_limit = $numrows;
- $result_limit = $result;
- }
-
- if ($numrows_limit>0) {
- // Produce headline
- echo "<div align='center'><table border='0' class='tab_cadre'><tr>";
-
- // Name
- echo "<th>";
- if ($sort=="comp.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=comp.name&order=ASC&start=$start\">";
- echo $lang["computers"][7]."</a></th>";
-
- // Manufacturer
- echo "<th>";
- if ($sort=="glpi_enterprises.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_enterprises.name&order=ASC&start=$start\">";
- echo $lang["common"][5]."</a></th>";
-
- // Serial
- echo "<th>";
- if ($sort=="comp.serial") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=comp.serial&order=ASC&start=$start\">";
- echo $lang["computers"][6]."</a></th>";
-
-
- // Type
- echo "<th>";
- if ($sort=="glpi_type_computers.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_type_computers.name&order=ASC&start=$start\">";
- echo $lang["computers"][8]."</a></th>";
-
- // OS
- echo "<th>";
- if ($sort=="glpi_dropdown_os.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_dropdown_os.name&order=ASC&start=$start\">";
- echo $lang["computers"][9]."</a></th>";
-
- // Location
- echo "<th>";
- if ($sort=="glpi_dropdown_locations.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_dropdown_locations.name&order=ASC&start=$start\">";
- echo $lang["computers"][10]."</a></th>";
-
- // Last modified
- echo "<th>";
- if ($sort=="date_mod") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=date_mod&order=DESC&start=$start\">";
- echo $lang["computers"][11]."</a></th>";
-
- // Contact person
- echo "<th>";
- if ($sort=="contact") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=contact&order=ASC&start=$start\">";
- echo $lang["computers"][16]."</a></th>";
-
- echo "</tr>";
-
- for ($i=0; $i < $numrows_limit; $i++) {
- $ID = $db->result($result_limit, $i, "ID");
- $comp = new Computer;
- $comp->getfromDB($ID,0);
- echo "<tr class='tab_bg_2'>";
- echo "<td><b>";
- echo "<a href=\"".$cfg_install["root"]."/computers/computers-info-form.php?ID=$ID\">";
- echo $comp->fields["name"]." (".$comp->fields["ID"].")";
- echo "</a></b></td>";
- echo "<td>". getDropdownName("glpi_enterprises",$comp->fields["FK_glpi_enterprise"]) ."</td>";
- echo "<td>".$comp->fields["serial"]."</td>";
- echo "<td>". getDropdownName("glpi_type_computers",$comp->fields["type"]) ."</td>";
- echo "<td>". getDropdownName("glpi_dropdown_os",$comp->fields["os"]) ."</td>";
- echo "<td>". getDropdownName("glpi_dropdown_locations", $comp->fields["location"]) ."</td>";
- echo "<td>".$comp->fields["date_mod"]."</td>";
- echo "<td>".$comp->fields["contact"]."</td>";
-
- echo "</tr>";
- }
-
- // Close Table
- echo "</table></div>";
-
- // Pager
- $parameters="field=$field&phrasetype=$phrasetype&contains=$contains&sort=$sort";
- printPager($start,$numrows,$target,$parameters);
-
- } else {
- echo "<div align='center'><b>".$lang["computers"][32]."</b></div>";
- echo "<hr noshade>";
- }
- }
-}
-
-function showComputerForm($target,$ID,$withtemplate='') {
- global $lang,$HTMLRel;;
- $comp = new Computer;
- $computer_spotted = false;
- if(empty($ID) && $withtemplate == 1) {
- if($comp->getEmpty()) $computer_spotted = true;
- } else {
- if($comp->getfromDB($ID)) $computer_spotted = true;
- }
- if($computer_spotted) {
- if(!empty($withtemplate) && $withtemplate == 2) {
- $template = "newcomp";
- $datestring = $lang["computers"][14].": ";
- $date = date("Y-m-d H:i:s");
- } elseif(!empty($withtemplate) && $withtemplate == 1) {
- $template = "newtemplate";
- $datestring = $lang["computers"][14].": ";
- $date = date("Y-m-d H:i:s");
- } else {
- $datestring = $lang["computers"][11]." : ";
- $date = $comp->fields["date_mod"];
- $template = false;
- }
-
- echo "<form name='form' method='post' action=\"$target\">";
- if(strcmp($template,"newtemplate") === 0) {
- echo "<input type=\"hidden\" name=\"is_template\" value=\"1\" />";
- }
- echo "<div align='center'>";
- echo "<table width='700px' class='tab_cadre' >";
- echo "<tr><th colspan ='2'align='center' >";
- if(!$template) {
- echo $lang["computers"][13].": ".$comp->fields["ID"];
- }elseif (strcmp($template,"newcomp") === 0) {
- echo $lang["computers"][12].": ".$comp->fields["tplname"];
- }elseif (strcmp($template,"newtemplate") === 0) {
- echo $lang["computers"][49]." : <input type='text' name='tplname' value=\"".$comp->fields["tplname"]."\" size='20'>";
- }
-
- echo "</th><th colspan ='2' align='center'>".$datestring.$date;
- echo "</th></tr>";
-
- echo "<tr class='tab_bg_1'><td>".$lang["computers"][7]." : </td>";
- echo "<td><input type='text' name='name' value=\"".$comp->fields["name"]."\" size='20'></td>";
-
- echo "<td>".$lang["computers"][16]." : </td><td><input type='text' name='contact' size='20' value=\"".$comp->fields["contact"]."\">";
- echo "</tr>";
-
- echo "<tr class='tab_bg_1'>";
-
- echo "<td >".$lang["computers"][10]." : </td>";
- echo "<td >";
- dropdownValue("glpi_dropdown_locations", "location", $comp->fields["location"]);
-
- echo "</td>";
-
-
-
- echo "<td>".$lang["computers"][15]." : </td><td><input type='text' name='contact_num' value=\"".$comp->fields["contact_num"]."\" size='20'></td></tr>";
- echo "<tr class='tab_bg_1'>";
- echo "<td >".$lang["computers"][50]." : </td>";
- echo "<td >";
- dropdownValue("glpi_contacts", "tech_num", $comp->fields["tech_num"]);
-
- echo "</td>";
- echo "<td colspan=2>";
- echo "</td></tr>";
-
-
- echo "<tr class='tab_bg_1'><td>".$lang["common"][5].": </td><td>";
- dropdownValue("glpi_enterprises","FK_glpi_enterprise",$comp->fields["FK_glpi_enterprise"]);
- echo "</td>";
-
- echo "<td valign='center' rowspan='4'>".$lang["computers"][19]." :</td><td valign='center' rowspan='4'><textarea cols='35' rows='6' name='comments' >".$comp->fields["comments"]."</textarea></td></tr>";
- echo "<tr class='tab_bg_1'><td>".$lang["computers"][18]." : </td>";
- echo "<td><input type='text' size='20' name='otherserial' value=\"".$comp->fields["otherserial"]."\">";
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_1'><td>".$lang["computers"][17]." : </td>";
- echo "<td><input type='text' name='serial' size='20' value=\"".$comp->fields["serial"]."\">";
- echo "</td></tr>";
-
-
- echo "<tr class='tab_bg_1'>";
-
-
-
- echo "<td>".$lang["computers"][27].": </td>";
-
- // Is Server?
- echo "<td>";
- if (isset($comp->fields["flags_server"]))
- {
- if($comp->fields["flags_server"] == 1)
- {
- echo "<input type='checkbox' name='flags_server' value='1' checked>";
- }
- else
- {
- echo "<input type='checkbox' name='flags_server' value='1'>";
- }
- }
- else
- {
- echo "<input type='checkbox' name='flags_server' value='1'>";
- }
- echo " ".$lang["computers"][28]."</td>";
-
- echo "</tr>";
-
-
-
- echo "<tr class='tab_bg_1'>";
-
- echo "<td>".$lang["computers"][9]." </td><td>";
- dropdownValue("glpi_dropdown_os", "os", $comp->fields["os"]);
- echo "</td>";
-
- if (!$template){
- echo "<td>".$lang["reservation"][24]." :</td><td><b>";
- showReservationForm(1,$ID);
- echo "</b></td>";
- } else echo "<td> </td><td> </td>";
-
-
-
-
-
- echo "</tr><tr>";
-
- if ($template) {
- if (empty($ID)||$withtemplate==2){
- echo "<td class='tab_bg_2' align='center' colspan='4'>\n";
- echo "<input type='submit' name='add' value=\"".$lang["buttons"][8]."\" class='submit'>";
- echo "</td>\n";
- } else {
- echo "<td class='tab_bg_2' align='center' colspan='4'>\n";
- echo "<input type='hidden' name='ID' value=$ID>";
- echo "<input type='submit' name='update' value=\"".$lang["buttons"][7]."\" class='submit'>";
- echo "</td>\n";
- }
- } else {
- echo "<td class='tab_bg_2' colspan='2' align='center' valign='top'>\n";
- echo "<input type='submit' name='update' value=\"".$lang["buttons"][7]."\" class='submit'>";
- echo "</td>\n";
- echo "<td class='tab_bg_2' colspan='2' align='center'>\n";
- echo "<input type='hidden' name='ID' value=$ID>";
- echo "<div align='center'>";
- if ($comp->fields["deleted"]=='N')
- echo "<input type='submit' name='delete' value=\"".$lang["buttons"][6]."\" class='submit'>";
- else {
- echo "<input type='submit' name='restore' value=\"".$lang["buttons"][21]."\" class='submit'>";
-
- echo " <input type='submit' name='purge' value=\"".$lang["buttons"][22]."\" class='submit'>";
- }
- echo "</div>";
- echo "</td>";
- }
-
- echo "</tr>\n";
-
-
-
- echo "</table>";
- echo "</div>";
-
- echo "</form>";
-
-
- //print devices.
- echo "<div align='center'>";
- echo "<table width='700' class='tab_cadre' >";
- echo "<tr><th colspan='64'>".$lang["devices"][10]."</th></tr>";
- foreach($comp->devices as $key => $val) {
- $devType = $val["devType"];
- $devID = $val["devID"];
- $specif = $val["specificity"];
- $compDevID = $val["compDevID"];
- $device = new Device($devType);
- $device->getFromDB($devID);
- printDeviceComputer(&$device,$specif,$comp->fields["ID"],$compDevID,$withtemplate);
-
- echo "</div>";
- }
- //ADD a new device form.
- device_selecter($_SERVER["PHP_SELF"],$comp->fields["ID"],$withtemplate);
- echo "</table>";
- return true;
- }
- else {
- echo "<div align='center'><b>".$lang["computers"][32]."</b></div>";
- echo "<hr noshade>";
- searchFormComputers();
- return false;
- }
-}
-
-function updateComputer($input) {
- // Update a computer in the database
-
- $comp = new Computer;
- $comp->getFromDB($input["ID"],0);
-
- // set new date and make sure it gets updated
- $updates[0]= "date_mod";
- $comp->fields["date_mod"] = date("Y-m-d H:i:s");
-
- // Pop off the last two attributes, no longer needed
- $null=array_pop($input);
- $null=array_pop($input);
- $null=array_pop($input);
- // Get all flags and fill with 0 if unchecked in form
- foreach ($comp->fields as $key => $val) {
- if (eregi("\.*flag\.*",$key)) {
- if (empty($input[$key])) {
- $input[$key]=0;
- }
- }
- }
-
- // Fill the update-array with changes
- $x=1;
- foreach ($input as $key => $val) {
- if (empty($comp->fields[$key]) || $comp->fields[$key] != $input[$key]) {
- $comp->fields[$key] = $input[$key];
- $updates[$x] = $key;
- $x++;
- }
- }
- $comp->updateInDB($updates);
-}
-
-function addComputer($input) {
- // Add Computer
-
- $comp = new Computer;
-
- // set new date.
- $comp->fields["date_mod"] = date("Y-m-d H:i:s");
-
- // dump status
- $null=array_pop($input);
- $null=array_pop($input);
- $i=0;
- // fill array for update
- foreach ($input as $key => $val){
- if (!isset($comp->fields[$key]) || $comp->fields[$key] != $input[$key]) {
- $comp->fields[$key] = $input[$key];
- }
- }
- $comp->addToDB();
-}
-
-function deleteComputer($input,$force=0) {
- // Delete Computer
-
- $comp = new Computer;
- $comp->deleteFromDB($input["ID"],$force);
-}
-
-function restoreComputer($input) {
- // Restore Computer
-
- $ct = new Computer;
- $ct->restoreInDB($input["ID"]);
-}
-
-function showConnections($ID,$withtemplate='') {
-
- GLOBAL $cfg_layout, $cfg_install, $lang;
-
- $db = new DB;
-
- echo "<div align='center'><table border='0' width='90%' class='tab_cadre'>";
- echo "<tr><th colspan='3'>".$lang["connect"][0].":</th></tr>";
- echo "<tr><th>".$lang["computers"][39].":</th><th>".$lang["computers"][40].":</th><th>".$lang["computers"][46].":</th></tr>";
-
- echo "<tr class='tab_bg_1'>";
-
- // Printers
- echo "<td align='center'>";
- $query = "SELECT * from glpi_connect_wire WHERE end2='$ID' AND type='".PRINTER_TYPE."'";
- if ($result=$db->query($query)) {
- $resultnum = $db->numrows($result);
- if ($resultnum>0) {
- echo "<table width='100%'>";
- for ($i=0; $i < $resultnum; $i++) {
- $tID = $db->result($result, $i, "end1");
- $printer = new Printer;
- $printer->getfromDB($tID);
- echo "<tr ".($printer->fields["deleted"]=='Y'?"class='tab_bg_2_2'":"").">";
- echo "<td align='center'><a href=\"".$cfg_install["root"]."/printers/printers-info-form.php?ID=$tID\"><b>";
- echo $printer->fields["name"]." (".$printer->fields["ID"].")";
- echo "</b></a></td>";
- if(!empty($withtemplate) && $withtemplate == 2) {
- //do nothing
- } else {
- echo "<td align='center'><a href=\"".$cfg_install["root"]."/computers/computers-info-form.php?cID=$ID&eID=$tID&disconnect=1&device_type=".PRINTER_TYPE."&withtemplate=".$withtemplate."\"><b>";
- echo $lang["buttons"][10];
- echo "</b></a></td>";
- }
- echo "</tr>";
- }
- echo "</table>";
- } else {
- echo $lang["computers"][38]."<br>";
- }
- if(!empty($withtemplate) && $withtemplate == 2) {
- //do nothing
- } else {
- echo "<a href=\"".$cfg_install["root"]."/computers/computers-info-form.php?ID=$ID&connect=1&device_type=printer&withtemplate=".$withtemplate."\"><b>";
- echo $lang["buttons"][9];
- echo "</b></a>";
- }
-
- }
- echo "</td>";
-
- // Monitors
- echo "<td align='center'>";
- $query = "SELECT * from glpi_connect_wire WHERE end2='$ID' AND type='".MONITOR_TYPE."'";
- if ($result=$db->query($query)) {
- $resultnum = $db->numrows($result);
- if ($resultnum>0) {
- echo "<table width='100%'>";
- for ($i=0; $i < $resultnum; $i++) {
- $tID = $db->result($result, $i, "end1");
- $monitor = new Monitor;
- $monitor->getfromDB($tID);
- echo "<tr ".($monitor->fields["deleted"]=='Y'?"class='tab_bg_2_2'":"").">";
- echo "<td align='center'><a href=\"".$cfg_install["root"]."/monitors/monitors-info-form.php?ID=$tID\"><b>";
- echo $monitor->fields["name"]." (".$monitor->fields["ID"].")";
- echo "</b></a></td>";
- if(!empty($withtemplate) && $withtemplate == 2) {
- //do nothing
- } else {
- echo "<td align='center'><a href=\"".$cfg_install["root"]."/computers/computers-info-form.php?cID=$ID&eID=$tID&disconnect=1&device_type=".MONITOR_TYPE."&withtemplate=".$withtemplate."\"><b>";
- echo $lang["buttons"][10];
- echo "</b></a></td>";
- }
- echo "</tr>";
- }
- echo "</table>";
- } else {
- echo $lang["computers"][37]."<br>";
- }
- if(!empty($withtemplate) && $withtemplate == 2) {
- //do nothing
- } else {
- echo "<a href=\"".$cfg_install["root"]."/computers/computers-info-form.php?ID=$ID&connect=1&device_type=monitor&withtemplate=".$withtemplate."\"><b>";
- echo $lang["buttons"][9];
- echo "</b></a>";
- }
-
- }
- echo "</td>";
-
- //Peripherals
- echo "<td align='center'>";
- $query = "SELECT * from glpi_connect_wire WHERE end2='$ID' AND type='".PERIPHERAL_TYPE."'";
- if ($result=$db->query($query)) {
- $resultnum = $db->numrows($result);
- if ($resultnum>0) {
- echo "<table width='100%'>";
- for ($i=0; $i < $resultnum; $i++) {
- $tID = $db->result($result, $i, "end1");
- $periph = new Peripheral;
- $periph->getfromDB($tID);
- echo "<tr ".($periph->fields["deleted"]=='Y'?"class='tab_bg_2_2'":"").">";
- echo "<td align='center'><a href=\"".$cfg_install["root"]."/peripherals/peripherals-info-form.php?ID=$tID\"><b>";
- echo $periph->fields["name"]." (".$periph->fields["ID"].")";
- echo "</b></a></td>";
- if(!empty($withtemplate) && $withtemplate == 2) {
- //do nothing
- } else {
- echo "<td align='center'><a href=\"".$cfg_install["root"]."/computers/computers-info-form.php?cID=$ID&eID=$tID&disconnect=1&device_type=".PERIPHERAL_TYPE."&withtemplate=".$withtemplate."\"><b>";
- echo $lang["buttons"][10];
- echo "</b></a></td>";
- }
- echo "</tr>";
- }
- echo "</table>";
- } else {
- echo $lang["computers"][47]."<br>";
- }
- if(!empty($withtemplate) && $withtemplate == 2) {
- //do nothing
- } else {
- echo "<a href=\"".$cfg_install["root"]."/computers/computers-info-form.php?ID=$ID&connect=1&device_type=peripheral&withtemplate=".$withtemplate."\"><b>";
- echo $lang["buttons"][9];
- echo "</b></a>";
- }
-
- }
-
- echo "</tr>";
- echo "</table></div><br>";
-
-}
-
-
-
-
-?>
diff -Nur web/glpi/glpi/glpi/computers/_relpos.php glpi/glpi/computers/_relpos.php
--- web/glpi/glpi/glpi/computers/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/computers/_relpos.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/config/config_db.php glpi/glpi/config/config_db.php
--- web/glpi/glpi/glpi/config/config_db.php 2005-03-04 11:24:38.000000000 +0100
+++ glpi/glpi/config/config_db.php 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-<?php
- class DB extends DBmysql {
- var $dbhost = "localhost";
- var $dbuser = "root";
- var $dbpassword= "";
- var $dbdefault = "glpi";
- }
- ?>
\ Pas de fin de ligne à la fin du fichier.
diff -Nur web/glpi/glpi/glpi/config/config.php glpi/glpi/config/config.php
--- web/glpi/glpi/glpi/config/config.php 2005-03-07 09:57:34.000000000 +0100
+++ glpi/glpi/config/config.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/config/CVS/Entries glpi/glpi/config/CVS/Entries
--- web/glpi/glpi/glpi/config/CVS/Entries 2005-03-07 09:57:34.000000000 +0100
+++ glpi/glpi/config/CVS/Entries 2005-03-07 14:02:49.000000000 +0100
@@ -1,3 +1,3 @@
-/_relpos.php/1.4/Sat Feb 12 16:00:10 2005//
-/config.php/1.40/Mon Mar 7 08:57:34 2005//
+/_relpos.php/1.5/Mon Mar 7 10:44:24 2005//
+/config.php/1.41/Mon Mar 7 10:44:24 2005//
D
diff -Nur web/glpi/glpi/glpi/config/_relpos.php glpi/glpi/config/_relpos.php
--- web/glpi/glpi/glpi/config/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/config/_relpos.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/contacts/classes.php glpi/glpi/contacts/classes.php
--- web/glpi/glpi/glpi/contacts/classes.php 2005-02-19 03:02:40.000000000 +0100
+++ glpi/glpi/contacts/classes.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/contacts/CVS/Entries glpi/glpi/contacts/CVS/Entries
--- web/glpi/glpi/glpi/contacts/CVS/Entries 2005-03-04 09:45:52.000000000 +0100
+++ glpi/glpi/contacts/CVS/Entries 2005-03-07 14:02:50.000000000 +0100
@@ -1,4 +1,4 @@
-/_relpos.php/1.1/Sat Feb 19 02:02:40 2005//
-/classes.php/1.1/Sat Feb 19 02:02:40 2005//
-/functions.php/1.5/Sat Feb 26 23:00:42 2005//
+/_relpos.php/1.2/Mon Mar 7 10:44:24 2005//
+/classes.php/1.2/Mon Mar 7 10:44:24 2005//
+/functions.php/1.6/Mon Mar 7 10:44:24 2005//
D
diff -Nur web/glpi/glpi/glpi/contacts/functions.php glpi/glpi/contacts/functions.php
--- web/glpi/glpi/glpi/contacts/functions.php 2005-02-27 00:00:42.000000000 +0100
+++ glpi/glpi/contacts/functions.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/contacts/_relpos.php glpi/glpi/contacts/_relpos.php
--- web/glpi/glpi/glpi/contacts/_relpos.php 2005-02-19 03:02:40.000000000 +0100
+++ glpi/glpi/contacts/_relpos.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/contracts/classes.php glpi/glpi/contracts/classes.php
--- web/glpi/glpi/glpi/contracts/classes.php 2005-02-20 15:21:34.000000000 +0100
+++ glpi/glpi/contracts/classes.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/contracts/CVS/Entries glpi/glpi/contracts/CVS/Entries
--- web/glpi/glpi/glpi/contracts/CVS/Entries 2005-03-07 09:57:34.000000000 +0100
+++ glpi/glpi/contracts/CVS/Entries 2005-03-07 14:02:50.000000000 +0100
@@ -1,4 +1,4 @@
-/_relpos.php/1.1/Sat Feb 19 19:47:10 2005//
-/classes.php/1.3/Sun Feb 20 14:21:34 2005//
-/functions.php/1.14/Mon Mar 7 08:57:34 2005//
+/_relpos.php/1.2/Mon Mar 7 10:44:24 2005//
+/classes.php/1.4/Mon Mar 7 10:44:24 2005//
+/functions.php/1.15/Mon Mar 7 10:44:24 2005//
D
diff -Nur web/glpi/glpi/glpi/contracts/functions.php glpi/glpi/contracts/functions.php
--- web/glpi/glpi/glpi/contracts/functions.php 2005-03-07 09:57:34.000000000 +0100
+++ glpi/glpi/contracts/functions.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/contracts/_relpos.php glpi/glpi/contracts/_relpos.php
--- web/glpi/glpi/glpi/contracts/_relpos.php 2005-02-19 20:47:10.000000000 +0100
+++ glpi/glpi/contracts/_relpos.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/CVS/Entries glpi/glpi/CVS/Entries
--- web/glpi/glpi/glpi/CVS/Entries 2005-03-07 09:57:36.000000000 +0100
+++ glpi/glpi/CVS/Entries 2005-03-07 14:02:48.000000000 +0100
@@ -1,36 +1,18 @@
/.htaccess/1.3/Mon Sep 13 18:28:37 2004//
-/_relpos.php/1.4/Sat Feb 12 16:00:10 2005//
-/includes.php/1.5/Sat Feb 12 16:00:10 2005//
-/includes_cartridges.php/1.1/Sun Feb 13 16:53:28 2005//
-/includes_computers.php/1.4/Sat Feb 12 16:00:10 2005//
-/includes_devices.php/1.1/Sat Feb 12 23:11:15 2005//
-/includes_enterprises.php/1.1/Thu Mar 3 15:21:58 2005//
-/includes_financial.php/1.5/Thu Mar 3 15:21:58 2005//
-/includes_knowbase.php/1.2/Sat Feb 12 16:00:10 2005//
-/includes_monitors.php/1.4/Sat Feb 12 16:00:10 2005//
-/includes_networking.php/1.4/Sat Feb 12 16:00:10 2005//
-/includes_peripherals.php/1.4/Sat Feb 12 16:00:10 2005//
-/includes_printers.php/1.4/Sat Feb 12 16:00:10 2005//
-/includes_reservation.php/1.2/Sat Feb 12 16:00:10 2005//
-/includes_setup.php/1.4/Sat Feb 12 16:00:10 2005//
-/includes_software.php/1.4/Sat Feb 12 16:00:10 2005//
-/includes_tracking.php/1.4/Sat Feb 12 16:00:10 2005//
-D/cartridges////
-D/common////
-D/computers////
-D/config////
-D/contacts////
-D/contracts////
-D/devices////
-D/dicts////
-D/enterprises////
-D/infocoms////
-D/knowbase////
-D/monitors////
-D/networking////
-D/peripherals////
-D/printers////
-D/reservation////
-D/setup////
-D/software////
-D/tracking////
+/_relpos.php/1.5/Mon Mar 7 10:44:24 2005//
+/includes.php/1.6/Mon Mar 7 10:44:24 2005//
+/includes_cartridges.php/1.2/Mon Mar 7 10:44:24 2005//
+/includes_computers.php/1.5/Mon Mar 7 10:44:24 2005//
+/includes_devices.php/1.2/Mon Mar 7 10:44:24 2005//
+/includes_enterprises.php/1.2/Mon Mar 7 10:44:24 2005//
+/includes_financial.php/1.6/Mon Mar 7 10:44:24 2005//
+/includes_knowbase.php/1.3/Mon Mar 7 10:44:24 2005//
+/includes_monitors.php/1.5/Mon Mar 7 10:44:24 2005//
+/includes_networking.php/1.5/Mon Mar 7 10:44:24 2005//
+/includes_peripherals.php/1.5/Mon Mar 7 10:44:24 2005//
+/includes_printers.php/1.5/Mon Mar 7 10:44:24 2005//
+/includes_reservation.php/1.3/Mon Mar 7 10:44:24 2005//
+/includes_setup.php/1.5/Mon Mar 7 10:44:24 2005//
+/includes_software.php/1.5/Mon Mar 7 10:44:24 2005//
+/includes_tracking.php/1.5/Mon Mar 7 10:44:24 2005//
+D
diff -Nur web/glpi/glpi/glpi/CVS/Entries.Log glpi/glpi/CVS/Entries.Log
--- web/glpi/glpi/glpi/CVS/Entries.Log 1970-01-01 01:00:00.000000000 +0100
+++ glpi/glpi/CVS/Entries.Log 2005-03-07 14:02:54.000000000 +0100
@@ -0,0 +1,20 @@
+A D/cartridges////
+A D/common////
+A D/computers////
+A D/config////
+A D/contacts////
+A D/contracts////
+A D/devices////
+A D/dicts////
+A D/enterprises////
+A D/infocoms////
+A D/knowbase////
+A D/ldap////
+A D/monitors////
+A D/networking////
+A D/peripherals////
+A D/printers////
+A D/reservation////
+A D/setup////
+A D/software////
+A D/tracking////
diff -Nur web/glpi/glpi/glpi/devices/classes.php glpi/glpi/devices/classes.php
--- web/glpi/glpi/glpi/devices/classes.php 2005-03-07 09:57:34.000000000 +0100
+++ glpi/glpi/devices/classes.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,20 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
- Based on:
-IRMA, Information Resource-Management and Administration
-Christian Bauer
- ----------------------------------------------------------------------
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -29,10 +24,7 @@
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
- ----------------------------------------------------------------------
- Original Author of file:
- Purpose of file:
- ----------------------------------------------------------------------
+ ------------------------------------------------------------------------
*/
include ("_relpos.php");
diff -Nur web/glpi/glpi/glpi/devices/CVS/Entries glpi/glpi/devices/CVS/Entries
--- web/glpi/glpi/glpi/devices/CVS/Entries 2005-03-07 09:57:34.000000000 +0100
+++ glpi/glpi/devices/CVS/Entries 2005-03-07 14:02:50.000000000 +0100
@@ -1,4 +1,4 @@
-/_relpos.php/1.1/Sat Feb 12 23:11:15 2005//
-/classes.php/1.3/Mon Mar 7 08:57:34 2005//
-/functions.php/1.10/Mon Mar 7 08:57:34 2005//
+/_relpos.php/1.2/Mon Mar 7 10:44:24 2005//
+/classes.php/1.4/Mon Mar 7 10:44:24 2005//
+/functions.php/1.11/Mon Mar 7 10:44:24 2005//
D
diff -Nur web/glpi/glpi/glpi/devices/functions.php glpi/glpi/devices/functions.php
--- web/glpi/glpi/glpi/devices/functions.php 2005-03-07 09:57:34.000000000 +0100
+++ glpi/glpi/devices/functions.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,16 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
- ----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -25,10 +24,7 @@
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
- ----------------------------------------------------------------------
- Original Author of file:
- Purpose of file:
- ----------------------------------------------------------------------
+ ------------------------------------------------------------------------
*/
function getDeviceTable($dev_type){
diff -Nur web/glpi/glpi/glpi/devices/_relpos.php glpi/glpi/devices/_relpos.php
--- web/glpi/glpi/glpi/devices/_relpos.php 2005-02-13 00:11:15.000000000 +0100
+++ glpi/glpi/devices/_relpos.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/dicts/CVS/Entries glpi/glpi/dicts/CVS/Entries
--- web/glpi/glpi/glpi/dicts/CVS/Entries 2005-03-07 09:57:34.000000000 +0100
+++ glpi/glpi/dicts/CVS/Entries 2005-03-07 14:02:51.000000000 +0100
@@ -1,8 +1,5 @@
-/deutsch.php/1.34/Sat Feb 12 16:00:10 2005//
-/english.php/1.46/Sat Feb 12 19:10:21 2005//
-/italian.php/1.23/Sat Feb 12 16:00:10 2005//
-/transrapi.css/1.2/Sat Sep 11 17:40:05 2004//
-/transrapi.js/1.1/Sun Aug 29 18:09:14 2004//
-/transrapi.php/1.3/Sat Sep 11 17:40:05 2004//
-/french.php/1.180/Result of merge+Mon Mar 7 08:57:34 2005//
+/deutsch.php/1.35/Mon Mar 7 10:44:24 2005//
+/english.php/1.47/Mon Mar 7 10:44:25 2005//
+/french.php/1.182/Mon Mar 7 11:02:39 2005//
+/italian.php/1.24/Mon Mar 7 10:44:25 2005//
D
diff -Nur web/glpi/glpi/glpi/dicts/deutsch.php glpi/glpi/dicts/deutsch.php
--- web/glpi/glpi/glpi/dicts/deutsch.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/dicts/deutsch.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,25 +1,30 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License (GPL)
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ This file is part of GLPI.
- To read the license please visit http://www.gnu.org/copyleft/gpl.html
+ GLPI is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ GLPI is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ 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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/dicts/english.php glpi/glpi/dicts/english.php
--- web/glpi/glpi/glpi/dicts/english.php 2005-02-12 20:10:21.000000000 +0100
+++ glpi/glpi/dicts/english.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,27 +1,30 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- Report bugs on glpi-dev @ gna.org
----------------------------------------------------------------------
+
LICENSE
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License (GPL)
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ This file is part of GLPI.
- To read the license please visit http://www.gnu.org/copyleft/gpl.html
- ----------------------------------------------------------------------
+ GLPI is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ GLPI is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ 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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/dicts/french.php glpi/glpi/dicts/french.php
--- web/glpi/glpi/glpi/dicts/french.php 2005-03-07 10:05:31.000000000 +0100
+++ glpi/glpi/dicts/french.php 2005-03-07 12:02:39.000000000 +0100
@@ -1,26 +1,30 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License (GPL)
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ This file is part of GLPI.
- To read the license please visit http://www.gnu.org/copyleft/gpl.html
- ----------------------------------------------------------------------
+ GLPI is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ GLPI is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ 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
+ ------------------------------------------------------------------------
*/
// Based on:
@@ -42,6 +46,7 @@
$lang["common"][6] = "Nom du modèle";
$lang["common"][7] = "Choisissez un modèle";
$lang["common"][8] = "Modèles";
+$lang["common"][9] = "Ajouter modèle...";
//Login
@@ -325,9 +330,7 @@
$lang["computers"][45] = "Choisissez un modèle";
$lang["computers"][46] = "Périphériques";
$lang["computers"][47] = "Pas de périphérique connecté";
-$lang["computers"][48] = "Modification de lieu. Les éléments connectés ont été déplacés dans le même lieu.";
-$lang["computers"][49] = "Nom du modele";
-$lang["computers"][50] = "Responsable technique";
+$lang["computers"][48] = "Modification de lieu. Les éléments connectés ont été déplacés dans le même lieu que l'ordinateur.";
// Networking
@@ -386,7 +389,6 @@
$lang["networking"][52] = "N° Prise";
$lang["networking"][53] = "Nouveau matériel à partir d'un modèle";
$lang["networking"][54] = "Matériel ID";
-$lang["networking"][55] = "Responsable technique";
// Printers
$lang["printers"][0] = "Ajouter imprimante...";
@@ -419,7 +421,6 @@
$lang["printers"][27] = "Port USB";
$lang["printers"][28] = "Nouvelle imprimante à partir d'un modèle";
$lang["printers"][29] = "Imprimante ID";
-$lang["printers"][30] = "Responsable technique";
// Monitors
$lang["monitors"][0] = "Ajouter moniteur...";
@@ -451,7 +452,6 @@
$lang["monitors"][28] = "Ecrans";
$lang["monitors"][29] = "Ecran ID";
$lang["monitors"][30] = "Nouvel écran à partir d'un modèle";
-$lang["monitors"][31] = "Responsable technique";
// Software
@@ -530,7 +530,6 @@
$lang["peripherals"][28] = "Périphériques";
$lang["peripherals"][29] = "Périphérique ID";
$lang["peripherals"][30] = "Nouveau périphérique à partir d'un modèle";
-$lang["peripherals"][31] = "Responsable technique";
// Reports
@@ -567,21 +566,7 @@
$lang["reports"][30] = "Périphériques sous contrat de maintenance";
$lang["reports"][31] ="complet";
$lang["reports"][32] ="limité";
-$lang["reports"][33] ="Rapport réseau";
-$lang["reports"][34] ="numéro de l'étage";
-$lang["reports"][35] ="Bureau";
-$lang["reports"][36] ="Periphériques connectés";
-$lang["reports"][37] ="Prises";
-$lang["reports"][38] ="IP";
-$lang["reports"][39] ="étage";
-$lang["reports"][40] ="bureau";
-$lang["reports"][41] ="switch";
-$lang["reports"][42] ="nom du switch";
-$lang["reports"][43] ="numéro du bureau";
-$lang["reports"][44] ="numéro de la prise";
-$lang["reports"][45] ="carte";
-$lang["reports"][46] ="port du switch";
-$lang["reports"][47] ="port du périphérique";
+
// LDAP
$lang["ldap"][0] = "recherche";
diff -Nur web/glpi/glpi/glpi/dicts/french.php~ glpi/glpi/dicts/french.php~
--- web/glpi/glpi/glpi/dicts/french.php~ 2005-03-07 10:05:00.000000000 +0100
+++ glpi/glpi/dicts/french.php~ 1970-01-01 01:00:00.000000000 +0100
@@ -1,1226 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License (GPL)
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- To read the license please visit http://www.gnu.org/copyleft/gpl.html
- ----------------------------------------------------------------------
-*/
-
-// Based on:
-// IRMA, Information Resource-Management and Administration
-// Christian Bauer
-// ----------------------------------------------------------------------
-// Original Author of file:
-// Purpose of file:
-// ----------------------------------------------------------------------
-
-
-// French test Dictionary
-$lang["common"][0] = "Sans nom";
-$lang["common"][1] = "Matériel";
-$lang["common"][2] = "ID";
-$lang["common"][3] = "Supprimés";
-$lang["common"][4] = "Web";
-$lang["common"][5] = "Fabriquant";
-$lang["common"][6] = "Nom du modèle";
-$lang["common"][7] = "Choisissez un modèle";
-$lang["common"][8] = "Modèles";
-
-//Login
-
-$lang["login"][0] = "Login impossible, vérifiez que votre navigateur accepte les cookies.";
-$lang["login"][1] = "Se reloguer";
-$lang["login"][2] = "Votre mot de passe n'est plus valide... Si vous venez de le changer reloguez vous avec le nouveau";
-$lang["login"][3] = "Non loggué";
-$lang["login"][4] = "Mauvais mot de passe";
-$lang["login"][5] = "Accés refusé";
-
-
-
-// Global
-$lang["buttons"][0] = "Rechercher";
-$lang["buttons"][1] = "Liste";
-$lang["buttons"][2] = "Valider";
-$lang["buttons"][3] = "Attribuer";
-$lang["buttons"][4] = "Installer";
-$lang["buttons"][5] = "Désinstaller";
-$lang["buttons"][6] = "Supprimer";
-$lang["buttons"][7] = "Actualiser";
-$lang["buttons"][8] = "Ajouter";
-$lang["buttons"][9] = "Connecter";
-$lang["buttons"][10] = "Déconnecter";
-$lang["buttons"][11] = "Suivant";
-$lang["buttons"][12] = "Précédent";
-$lang["buttons"][13] = "Retour";
-$lang["buttons"][14] = "Modifier";
-$lang["buttons"][15] = "Calendrier";
-$lang["buttons"][16] ="Raz";
-$lang["buttons"][17] ="Supprimer";
-$lang["buttons"][18] ="Tout cocher";
-$lang["buttons"][19] ="Tout décocher";
-$lang["buttons"][20] ="Déplacer";
-$lang["buttons"][21] ="Restaurer";
-$lang["buttons"][22] ="Purger";
-
-$lang["choice"][0] = "Oui";
-$lang["choice"][1] = "Non";
-
-$lang["search"][0] = "Rechercher ";
-$lang["search"][1] = "Où ce champ";
-$lang["search"][2] = "contient";
-$lang["search"][3] = "phrase exacte";
-$lang["search"][4] = "trié par";
-$lang["search"][5] = "Voir par lieu";
-$lang["search"][6] = "trié par";
-$lang["search"][7] = "Tous";
-$lang["search"][8] = "Date début";
-$lang["search"][9] = "Date fin";
-$lang["search"][10] = "dans";
-
-
-// Central
-$lang["central"][0] = "Bienvenue ";
-$lang["central"][1] = "vous êtes sur la console centrale.";
-$lang["central"][2] = "Derniers";
-$lang["central"][3] = "Evénements";
-$lang["central"][4] = "Pas d'événement";
-$lang["central"][5] = "Accueil";
-$lang["central"][6] = "Déconnexion";
-$lang["central"][7] = "Aide";
-
-
-//event
-$lang["event"][0] = "Item (ID)";
-$lang["event"][1] = "Date";
-$lang["event"][2] = "Service";
-$lang["event"][3] = "Niveau";
-$lang["event"][4] = "Message";
-
-// Pager
-$lang["pager"][1] = "à";
-$lang["pager"][2] = "de";
-$lang["pager"][3] = "sur";
-
-// Direct Connexions
-$lang["connect"][0] = "Connexions directes";
-$lang["connect"][1] = "non connecté";
-$lang["connect"][2] = "Connecter";
-$lang["connect"][3] = "Déconnecter";
-$lang["connect"][4] = "Faire une connexion directe";
-$lang["connect"][5] = "Sur un ordinateur qui";
-$lang["connect"][6] = "Nom";
-$lang["connect"][7] = "ID";
-$lang["connect"][8] = "contient";
-$lang["connect"][9] = "Choisissez un ordinateur dans la liste";
-$lang["connect"][10] = "Choisissez une imprimante dans la liste";
-$lang["connect"][11] = "Choisissez un périphérique dans la liste";
-$lang["connect"][12] = "Choisissez un écran dans la liste";
-$lang["connect"][13] = "Sur une imprimante qui";
-$lang["connect"][14] = "Sur un périphérique qui";
-$lang["connect"][15] = "Sur un écran qui";
-$lang["connect"][16] = "Aucun élément trouvé";
-$lang["connect"][17] = "Mise à jour automatique de la prise réseau qui n'était pas renseignée";
-$lang["connect"][18] = "Attention !! Les prises réseaux des deux matériels ne correspondent pas.";
-$lang["connect"][19] = "Mise à jour automatique de l'adresse IP qui n'était pas renseignée";
-$lang["connect"][20] = "Attention !! Les adresses IP des deux matériels ne correspondent pas.";
-$lang["connect"][21] = "Mise à jour automatique de l'adresse MAC qui n'était pas renseignée";
-$lang["connect"][22] = "Attention !! Les adresses MAC des deux matériels ne correspondent pas.";
-
-//header menu
-
-$lang["Menu"][0] = "Ordinateurs";
-$lang["Menu"][1] ="Réseaux";
-$lang["Menu"][2] ="Imprimantes";
-$lang["Menu"][3] ="Ecrans";
-$lang["Menu"][4] ="Logiciels";
-$lang["Menu"][5] ="Suivi";
-$lang["Menu"][6] ="Rapports";
-$lang["Menu"][7] ="Groupes";
-$lang["Menu"][8] ="Comptes";
-$lang["Menu"][9] ="Comptes mail";
-$lang["Menu"][10] ="Configuration";
-$lang["Menu"][11] ="Préferences";
-$lang["Menu"][12] ="Données";
-$lang["Menu"][13] ="Statistiques";
-$lang["Menu"][14] ="Utilisateurs";
-$lang["Menu"][15] ="Administration";
-$lang["Menu"][16] ="Périphériques";
-$lang["Menu"][17] ="Réservations";
-$lang["Menu"][18] ="Outils";
-$lang["Menu"][19] ="Base connaissances";
-$lang["Menu"][20] ="Fichiers configuration";
-$lang["Menu"][21] ="Cartouches";
-$lang["Menu"][22] ="Contacts";
-$lang["Menu"][23] ="Entreprises";
-$lang["Menu"][24] ="Infos commerciales";
-$lang["Menu"][25] ="Contrats";
-$lang["Menu"][26] ="Gestion";
-
-//Données
-
-$lang["backup"][0] ="Sauvegarde SQL";
-$lang["backup"][1] ="Sauvegarde XML";
-$lang["backup"][2] ="Sauvegarde de la base de données";
-$lang["backup"][3] ="Le fichier a bien été généré";
-$lang["backup"][5] ="Voir le fichier";
-$lang["backup"][6] ="Structure de la table";
-$lang["backup"][7] ="Données de la table";
-$lang["backup"][8] ="Restauré !";
-$lang["backup"][9] ="Supprimé !";
-$lang["backup"][10] ="Fichier";
-$lang["backup"][11] ="Taille";
-$lang["backup"][12] ="Date";
-$lang["backup"][13] ="Voir/Télécharger";
-$lang["backup"][14] ="Restaurer";
-$lang["backup"][15] ="Etes vous sur de vouloir sauvegarder la base de donnees";
-$lang["backup"][16] ="Etes vous certain de vouloir remplacer la base de donnees actuelle par le fichier de sauvegarde :";
-$lang["backup"][17] ="Etes vous certain de vouloir supprimer ce fichier";
-$lang["backup"][18] ="Etes vous certain de vouloir sauvegarder la base de donnees";
-$lang["backup"][19] ="Maintenant";
-$lang["backup"][20] ="Supp";
-
-// Tracking
-$lang["tracking"][0] = "Suivi des interventions";
-$lang["tracking"][1] = "Toutes les interventions actives";
-$lang["tracking"][2] = "Seulement les interventions qui vous sont attribuées";
-$lang["tracking"][3] = "Seulement les interventions non attribuées";
-$lang["tracking"][4] = "Seulement les interventions terminées";
-$lang["tracking"][5] = "Quand la description contient";
-$lang["tracking"][6] = "Vous n'etes pas autorisé à (re-)attribuer cette intervention";
-$lang["tracking"][7] = "Afficher...";
-$lang["tracking"][8] = "Pas de description, veuillez recommencer";
-$lang["tracking"][9] = "Nouvelle intervention postée, suivante...";
-$lang["tracking"][10] = "Ajout de l'intervention impossible, verifiez la base de données";
-$lang["tracking"][11] = "Intervention(s) requise(s) par cet utilisateur";
-$lang["tracking"][12] = "Tous les types de matériels";
-$lang["tracking"][13] = "Seulement les ordinateurs";
-$lang["tracking"][14] = "Seulement le matériel reseau";
-$lang["tracking"][15] = "Seulement les imprimantes";
-$lang["tracking"][16] = "Seulement les moniteurs";
-$lang["tracking"][17] = "Seulement les périphériques";
-$lang["tracking"][18] = "Seulement les logiciels";
-$lang["tracking"][19] = "Seulement Générales";
-$lang["tracking"][20] = "Catégorie";
-$lang["tracking"][21] = "Vous n'etes pas autorisé à modifier la catégorie de cette intervention";
-$lang["tracking"][22] = "Vous n'etes pas autorisé à modifier la priorité de cette intervention";
-
-// 1 computers
-// 2 networking
-// 3 printers
-// 4 monitors
-// 5 peripherals
-// 6 software
-
-$lang["joblist"][0] = "Statut";
-$lang["joblist"][1] = "Date";
-$lang["joblist"][2] = "Priorité";
-$lang["joblist"][3] = "Auteur";
-$lang["joblist"][4] = "Attribué";
-$lang["joblist"][5] = "Ordinateur";
-$lang["joblist"][6] = "Description";
-$lang["joblist"][7] = "Nouvelle intervention pour cet item...";
-$lang["joblist"][8] = "Pas d'intervention trouvée.";
-$lang["joblist"][9] = "Nouveau";
-$lang["joblist"][10] = "Ancien";
-$lang["joblist"][11] = "Ouvert le";
-$lang["joblist"][12] = "Fermé le";
-$lang["joblist"][13] = "Infos";
-$lang["joblist"][14] = "Terminer";
-$lang["joblist"][15] = "Attribuer";
-$lang["joblist"][16] = "Pas d'intervention en cours.";
-$lang["joblist"][17] = "Trés haute";
-$lang["joblist"][18] = "Haute";
-$lang["joblist"][19] = "Normale";
-$lang["joblist"][20] = "Basse";
-$lang["joblist"][21] = "Trés basse";
-$lang["joblist"][22] = "Pas d'ancienne intervention trouvée";
-$lang["joblist"][23] = "Rajouter une ancienne intervention à l'historique";
-
-$lang["job"][0] = "Numéro d'intervention";
-$lang["job"][1] = "Intervention toujours ouverte...";
-$lang["job"][2] = "Cette intervention a été ouverte à";
-$lang["job"][3] = "Intervention terminée, marquer comme ancienne.";
-$lang["job"][4] = "Attribuer intervention";
-$lang["job"][5] = "Attribuée à";
-$lang["job"][6] = "Attribuer";
-$lang["job"][7] = "Suivi";
-$lang["job"][8] = "Pas de suivi pour cette intervention.";
-$lang["job"][9] = "Envoyer un nouveau suivi pour cette intervention";
-$lang["job"][10] = "Pas de suivi pour cette intervention.";
-$lang["job"][11] = "Décrivez le probleme/action";
-$lang["job"][12] = "Pas de suivi pour cette intervention.";
-$lang["job"][13] = "Ajouter une nouvelle intervention";
-$lang["job"][14] = "Nouvelle intervention";
-$lang["job"][15] = "Historique";
-$lang["job"][16] = "trouvée ";
-$lang["job"][17] = "intervention";
-$lang["job"][18] = "ancienne";
-$lang["job"][19] = "Suivi par Email";
-$lang["job"][20] = "Durée réelle de l'intervention";
-$lang["job"][21] = "Heure(s)";
-$lang["job"][22] = "Minute(s)";
-$lang["job"][23] = "Restaurer cette intervention";
-$lang["job"][24] = "Catégorie de l'intervention";
-
-// Computers
-
-$lang["computers"][0] = "Ajouter ordinateur...";
-$lang["computers"][1] = "Identifiant";
-$lang["computers"][6] = "N° série";
-$lang["computers"][7] = "Nom";
-$lang["computers"][8] = "Type";
-$lang["computers"][9] = "OS";
-$lang["computers"][10] = "Lieu";
-$lang["computers"][11] = "Dernière modif";
-$lang["computers"][12] = "Nouvel ordinateur à partir d'un modèle";
-$lang["computers"][13] = "Ordinateur ID";
-$lang["computers"][14] = "Inseré";
-$lang["computers"][15] = "Contact numero";
-$lang["computers"][16] = "Contact";
-$lang["computers"][17] = "N° de série";
-$lang["computers"][18] = "N° d'inventaire";
-$lang["computers"][19] = "Commentaires";
-$lang["computers"][20] = "OS Version";
-$lang["computers"][21] = "CPU";
-$lang["computers"][22] = "MHZ";
-$lang["computers"][23] = "RAM Typ";
-$lang["computers"][24] = "RAM (MB)";
-$lang["computers"][25] = "HD (GB)";
-$lang["computers"][26] = "Carte réseau";
-$lang["computers"][27] = "Flags";
-$lang["computers"][28] = "Serveur";
-$lang["computers"][29] = ""; // reservé
-$lang["computers"][30] = ""; // reservé
-$lang["computers"][31] = "ID";
-$lang["computers"][32] = "Pas d'ordinateur trouvé";
-$lang["computers"][33] = "Carte son";
-$lang["computers"][34] = "Carte graphique";
-$lang["computers"][35] = "Carte mère";
-$lang["computers"][36] = "HD-Type";
-$lang["computers"][37] = "Pas d'écran connecté.";
-$lang["computers"][38] = "Pas d'imprimante connectée";
-$lang["computers"][39] = "Imprimantes";
-$lang["computers"][40] = "Ecrans";
-$lang["computers"][41] = "Date d'achat";
-$lang["computers"][42] = "Expiration garantie";
-$lang["computers"][43] = "Maintenance";
-$lang["computers"][44] = "Ordinateurs";
-$lang["computers"][45] = "Choisissez un modèle";
-$lang["computers"][46] = "Périphériques";
-$lang["computers"][47] = "Pas de périphérique connecté";
-$lang["computers"][48] = "Modification de lieu. Les éléments connectés ont été déplacés dans le même lieu.";
-$lang["computers"][49] = "Nom du modele";
-$lang["computers"][50] = "Responsable technique";
-
-// Networking
-
-$lang["networking"][0] = "Nom";
-$lang["networking"][1] = "Lieu";
-$lang["networking"][2] = "Type";
-$lang["networking"][3] = "Contact";
-$lang["networking"][4] = "Contact numero";
-$lang["networking"][5] = "RAM (MB)";
-$lang["networking"][6] = "Numéro série";
-$lang["networking"][7] = "Numéro d'inventaire";
-$lang["networking"][8] = "Commentaire";
-$lang["networking"][9] = "Dernière modification";
-$lang["networking"][10] = "";
-$lang["networking"][11] = "Ajouter Materiel réseau...";
-$lang["networking"][12] = "Materiel réseau";
-$lang["networking"][13] = "port(s) réseau trouvé(s)";
-$lang["networking"][14] = "IP";
-$lang["networking"][15] = "MAC";
-$lang["networking"][16] = "Interface";
-$lang["networking"][17] = "Connecté à";
-$lang["networking"][18] = "";
-$lang["networking"][19] = "Ajouter un port...";
-$lang["networking"][20] = "Port Manager";
-$lang["networking"][21] = "Logical Number";
-$lang["networking"][22] = "Interface Address";
-$lang["networking"][23] = "Interface MAC";
-$lang["networking"][24] = "Connexion";
-$lang["networking"][25] = "sur";
-$lang["networking"][26] = "Non connecté.";
-$lang["networking"][27] = "Port de connexion";
-$lang["networking"][28] = "(Etape 1)";
-$lang["networking"][29] = "A un ordinateur dont";
-$lang["networking"][30] = "contient";
-$lang["networking"][31] = "ou choisisez un materiel réseau";
-$lang["networking"][32] = "(Etape 2)";
-$lang["networking"][33] = "Choisissez un ordinateurs dans le resultat";
-$lang["networking"][34] = "Materiel non connecté : aucuns ports trouvés";
-$lang["networking"][35] = "(derniere etape)";
-$lang["networking"][36] = "Liste de tous ports sur la machine";
-$lang["networking"][37] = "Port trouvé";
-$lang["networking"][38] = "Pas de machine trouvée.";
-$lang["networking"][39] = "Date d'achat";
-$lang["networking"][40] = "Expiration garantie";
-$lang["networking"][41] = "Maintenance";
-$lang["networking"][42] = "identifiant";
-$lang["networking"][43] = "Réseau";
-$lang["networking"][44] = "Le port";
-$lang["networking"][45] = "est maintenant connecté sur le port";
-$lang["networking"][46] = "Ajouter plusieurs ports...";
-$lang["networking"][47] = "De";
-$lang["networking"][48] = "A";
-$lang["networking"][49] = "Firmware";
-$lang["networking"][50] = "ID";
-$lang["networking"][51] = "Prise reseau";
-$lang["networking"][52] = "N° Prise";
-$lang["networking"][53] = "Nouveau matériel à partir d'un modèle";
-$lang["networking"][54] = "Matériel ID";
-$lang["networking"][55] = "Responsable technique";
-
-// Printers
-$lang["printers"][0] = "Ajouter imprimante...";
-$lang["printers"][1] = "Voir par lieu";
-$lang["printers"][2] = "trié par";
-$lang["printers"][3] = "Ajouter Imprimante";
-$lang["printers"][4] = "Imprimante";
-$lang["printers"][5] = "Nom";
-$lang["printers"][6] = "Lieu";
-$lang["printers"][7] = "contact numero";
-$lang["printers"][8] = "Contact Personne";
-$lang["printers"][9] = "Type";
-$lang["printers"][10] = "numero de série";
-$lang["printers"][11] = "numero d'inventaire";
-$lang["printers"][12] = "Commentaire";
-$lang["printers"][13] = "Lieu";
-$lang["printers"][14] = "Port série";
-$lang["printers"][15] = "Port parallèle";
-$lang["printers"][16] = "Dernière modification";
-$lang["printers"][17] = "Pas d'imprimante trouvée.";
-$lang["printers"][18] = "Flags";
-$lang["printers"][19] = "ID";
-$lang["printers"][20] = "Date d'achat ";
-$lang["printers"][21] = "Expiration garantie";
-$lang["printers"][22] = "Maintenance";
-$lang["printers"][23] = "Mémoire vive";
-$lang["printers"][24] = "Identifiant";
-$lang["printers"][25] = "Imprimantes";
-$lang["printers"][26] = "Nombre";
-$lang["printers"][27] = "Port USB";
-$lang["printers"][28] = "Nouvelle imprimante à partir d'un modèle";
-$lang["printers"][29] = "Imprimante ID";
-$lang["printers"][30] = "Responsable technique";
-
-// Monitors
-$lang["monitors"][0] = "Ajouter moniteur...";
-$lang["monitors"][3] = "Ajouter moniteur";
-$lang["monitors"][4] = "Moniteur";
-$lang["monitors"][5] = "Nom";
-$lang["monitors"][6] = "Lieu";
-$lang["monitors"][7] = "Contact numéro";
-$lang["monitors"][8] = "Contact";
-$lang["monitors"][9] = "Type";
-$lang["monitors"][10] = "Numéro de série";
-$lang["monitors"][11] = "Numéro d'inventaire";
-$lang["monitors"][12] = "Commentaire";
-$lang["monitors"][13] = "Lieu";
-$lang["monitors"][14] = "Microphone";
-$lang["monitors"][15] = "Enceintes";
-$lang["monitors"][16] = "Dernière modification";
-$lang["monitors"][17] = "Pas d'ecran trouvé.";
-$lang["monitors"][18] = "Options";
-$lang["monitors"][19] = "Sub-D";
-$lang["monitors"][20] = "BNC";
-$lang["monitors"][21] = "Taille";
-$lang["monitors"][22] = "Connecté a";
-$lang["monitors"][23] = "ID";
-$lang["monitors"][24] = "Date d'achat ";
-$lang["monitors"][25] = "Expiration garantie";
-$lang["monitors"][26] = "Maintenance";
-$lang["monitors"][27] = "identifiant";
-$lang["monitors"][28] = "Ecrans";
-$lang["monitors"][29] = "Ecran ID";
-$lang["monitors"][30] = "Nouvel écran à partir d'un modèle";
-$lang["monitors"][31] = "Responsable technique";
-
-
-// Software
-$lang["software"][0] = "Ajouter logiciel...";
-$lang["software"][1] = "ID";
-$lang["software"][2] = "Nom";
-$lang["software"][3] = "Plateforme";
-$lang["software"][4] = "Lieu";
-$lang["software"][5] = "Version";
-$lang["software"][6] = "Commentaires";
-$lang["software"][7] = "rechercher logiciel";
-$lang["software"][8] = "ou";
-$lang["software"][9] = "contient";
-$lang["software"][10] = "Logiciel";
-$lang["software"][11] = "Licences";
-$lang["software"][12] = "Ajouter licence...";
-$lang["software"][13] = "licence(s) trouvée(s)";
-$lang["software"][14] = "Pas de licence pour ce logiciel.";
-$lang["software"][15] = "Ajouter des licences pour un logiciel";
-$lang["software"][16] = "Numéros de série <br>'free' -> logiciels libres<br>'global' -> licences site";
-$lang["software"][17] = "logiciel installé";
-$lang["software"][18] = "Licence deja installée.";
-$lang["software"][19] = "Installations";
-$lang["software"][20] = "Restant";
-$lang["software"][21] = "Total";
-$lang["software"][22] = "Pas de logiciel trouvé.";
-$lang["software"][23] = "Logiciels";
-$lang["software"][24] = "Date fin";
-$lang["software"][25] = "Expire le";
-$lang["software"][26] = "N'expire jamais";
-$lang["software"][27] = "Licence expirée";
-$lang["software"][28] = "OEM";
-$lang["software"][29] = "Mise à jour";
-$lang["software"][30] = "depuis";
-$lang["software"][31] = "Numéros de série";
-$lang["software"][32] = "Expiration";
-$lang["software"][33] = "OEM";
-$lang["software"][34] = "Modifier une licence";
-$lang["software"][35] = "Acheté";
-$lang["software"][36] = "mise(s) à jour trouvée(s)";
-$lang["software"][37] = "A acheter";
-$lang["software"][38] = "Licence site";
-$lang["software"][39] = "Logiciel libre";
-$lang["software"][40] = "Aucune licence";
-$lang["software"][41] = "Logiciel ID";
-$lang["software"][42] = "Nouveau logicel à partir d'un modèle";
-
-
-// Peripherals
-$lang["peripherals"][0] = "Ajouter périphérique...";
-$lang["peripherals"][3] = "Ajouter périphérique";
-$lang["peripherals"][4] = "Périphérique";
-$lang["peripherals"][5] = "Nom";
-$lang["peripherals"][6] = "Lieu";
-$lang["peripherals"][7] = "Contact numéro";
-$lang["peripherals"][8] = "Contact";
-$lang["peripherals"][9] = "Type";
-$lang["peripherals"][10] = "Numéro de série";
-$lang["peripherals"][11] = "Numéro d'inventaire";
-$lang["peripherals"][12] = "Commentaire";
-$lang["peripherals"][13] = "Lieu";
-$lang["peripherals"][14] = "";
-$lang["peripherals"][15] = "";
-$lang["peripherals"][16] = "Dernière modification";
-$lang["peripherals"][17] = "Pas de peripherique trouvé.";
-$lang["peripherals"][18] = "Marque";
-$lang["peripherals"][19] = "";
-$lang["peripherals"][20] = "";
-$lang["peripherals"][21] = "Taille";
-$lang["peripherals"][22] = "Connecté a";
-$lang["peripherals"][23] = "ID";
-$lang["peripherals"][24] = "Date d'achat ";
-$lang["peripherals"][25] = "Expiration garantie";
-$lang["peripherals"][26] = "Maintenance";
-$lang["peripherals"][27] = "identifiant";
-$lang["peripherals"][28] = "Périphériques";
-<<<<<<< french.php
-$lang["peripherals"][29] = "Responsable technique";
-=======
-$lang["peripherals"][29] = "Périphérique ID";
-$lang["peripherals"][30] = "Nouveau périphérique à partir d'un modèle";
-
->>>>>>> 1.180
-
-// Reports
-$lang["reports"][0] = "Sélectionner un rapport à générer";
-$lang["reports"][1] = "Imprimantes sous contrat de maintenance";
-$lang["reports"][2] = "Moniteurs sous contrat de maintenance";
-$lang["reports"][3] = "Materiel réseau sous contrat de maintenance";
-$lang["reports"][4] = "Liste du materiel sous contrat de maintenance";
-$lang["reports"][5] = "Ordinateurs sous contrat de maintenance";
-$lang["reports"][6] = "Ordinateurs";
-$lang["reports"][7] ="Imprimantes";
-$lang["reports"][8] ="Materiel réseau";
-$lang["reports"][9] ="Moniteurs";
-$lang["reports"][10] ="Sélectionnez un type de matériel";
-$lang["reports"][11] ="Materiel sous contrat de maintenance";
-$lang["reports"][12] ="Type(s) de matériel";
-$lang["reports"][13] ="Date(s) d'achat";
-$lang["reports"][14] ="Option de tri";
-$lang["reports"][15] ="Afficher rapport";
-$lang["reports"][16] ="Tous";
-$lang["reports"][17] ="Date achat";
-$lang["reports"][18] ="N° serie";
-$lang["reports"][19] ="Nom contact";
-$lang["reports"][20] ="Lieu";
-$lang["reports"][21] ="Date fin garantie";
-$lang["reports"][22] ="Type de date";
-$lang["reports"][23] ="Date(s)";
-$lang["reports"][24] ="Restreindre aux ordinateurs";
-$lang["reports"][25] ="Rapport interventions";
-$lang["reports"][26] ="Rapport par défaut";
-$lang["reports"][27] ="Maintenance";
-$lang["reports"][28] ="Par année";
-$lang["reports"][29] ="Périphériques";
-$lang["reports"][30] = "Périphériques sous contrat de maintenance";
-$lang["reports"][31] ="complet";
-$lang["reports"][32] ="limité";
-$lang["reports"][33] ="Rapport réseau";
-$lang["reports"][34] ="numéro de l'étage";
-$lang["reports"][35] ="Bureau";
-$lang["reports"][36] ="Periphériques connectés";
-$lang["reports"][37] ="Prises";
-$lang["reports"][38] ="IP";
-$lang["reports"][39] ="étage";
-$lang["reports"][40] ="bureau";
-$lang["reports"][41] ="switch";
-$lang["reports"][42] ="nom du switch";
-$lang["reports"][43] ="numéro du bureau";
-$lang["reports"][44] ="numéro de la prise";
-$lang["reports"][45] ="carte";
-$lang["reports"][46] ="port du switch";
-$lang["reports"][47] ="port du périphérique";
-
-// LDAP
-$lang["ldap"][0] = "recherche";
-$lang["ldap"][1] = "Montrer";
-$lang["ldap"][2] = "et";
-$lang["ldap"][3] = "ou l'attribut";
-$lang["ldap"][4] = "Ajouter nouvelle entrée...";
-$lang["ldap"][5] = "requis";
-$lang["ldap"][6] = "permis";
-$lang["ldap"][7] = "LDAP";
-
-
-// Setup
-$lang["setup"][0] = "Intitulés";
-$lang["setup"][1] = "Modèles";
-$lang["setup"][2] = "Ajouter un utilisateur GLPI";
-$lang["setup"][3] = "Lieu";
-$lang["setup"][4] = "Type de machines";
-$lang["setup"][5] = "Système d'exploitation";
-$lang["setup"][6] = " Type RAM";
-$lang["setup"][7] = "Microprocesseur";
-$lang["setup"][8] = "Carte réseau";
-$lang["setup"][9] = "Interface réseau";
-$lang["setup"][10] = "Inventaire";
-$lang["setup"][11] = "changer le mot de passe pour";
-$lang["setup"][12] = "Utilisateur";
-$lang["setup"][13] = "Nom réel";
-$lang["setup"][14] = "E-Mail";
-$lang["setup"][15] = "Numéro de telephone";
-$lang["setup"][16] = "Lieux";
-$lang["setup"][17] = "Type de compte";
-$lang["setup"][18] = "Login";
-$lang["setup"][19] = "Password";
-$lang["setup"][20] = "Type";
-$lang["setup"][21] = "N'oubliez pas de mettre un mot de passe plus tard !";
-$lang["setup"][22] = "Ajouter un modèle";
-$lang["setup"][23] = "Nom du modèle";
-$lang["setup"][24] = "Nom";
-$lang["setup"][25] = "Lieux";
-$lang["setup"][26] = "Contact numéro";
-$lang["setup"][27] = "Contact Personne";
-$lang["setup"][28] = "Numéro de série";
-$lang["setup"][29] = "Numéro d'inventaire";
-$lang["setup"][30] = "Commentaire";
-$lang["setup"][31] = "Type";
-$lang["setup"][32] = "OS";
-$lang["setup"][33] = "OS Version";
-$lang["setup"][34] = "CPU";
-$lang["setup"][35] = "MHZ";
-$lang["setup"][36] = "RAM Type";
-$lang["setup"][37] = "RAM (MB)";
-$lang["setup"][38] = "HD (GB)";
-$lang["setup"][39] = "Carte réseau";
-$lang["setup"][40] = "Montrer les nouvelles interventions d'abord ?";
-$lang["setup"][41] = "Sélectionnez une Langue";
-$lang["setup"][42] = "Types de réseau";
-$lang["setup"][43] = "Types d'imprimantes";
-$lang["setup"][44] = "Types de moniteurs";
-$lang["setup"][45] = "Cartes mères";
-$lang["setup"][46] = "Cartes graphiques";
-$lang["setup"][47] = "Cartes son";
-$lang["setup"][48] = "Types de disque dur";
-$lang["setup"][49] = "Carte mère";
-$lang["setup"][50] = "Carte Graphique";
-$lang["setup"][51] = "Carte son";
-$lang["setup"][52] = "Type de disque dur";
-$lang["setup"][53] = "Date d'achat ";
-$lang["setup"][54] = "Expiration garantie";
-$lang["setup"][55] = "Maintenance";
-$lang["setup"][56] = "Configuration";
-$lang["setup"][57] = "Utilisateur";
-$lang["setup"][58] = "Droit d'attribution d'intervention";
-$lang["setup"][59] = "Configurer les droits d'attribution d'intervention";
-$lang["setup"][60] = "Non";
-$lang["setup"][61] = "Oui";
-$lang["setup"][62] = "Sélectionnez la catégorie à configurer";
-$lang["setup"][63] = "Attention vous êtes sur le point de supprimer un intitulé utilisé pour un ou plusieurs éléments.";
-$lang["setup"][64] = " Si vous confirmez la suppression, les éléments utilisant cet intitulé se verront attribuer un champs NULL";
-$lang["setup"][65] = "Vous pouvez aussi remplacer toutes les occurences de cet intitulé par un autre :";
-$lang["setup"][66] = "Pas d'utilisateur trouvé";
-$lang["setup"][67] = "Authentifications externes";
-$lang["setup"][68] = "Suivis par emails";
-$lang["setup"][69] = "Types de périphériques";
-$lang["setup"][70] = "Configuration générale";
-$lang["setup"][71] = "Firmware";
-$lang["setup"][72] = "Sélectionnez un intitulé";
-$lang["setup"][73] = "Prise réseau";
-$lang["setup"][74] = "Vous ne pouvez pas supprimer cet élément car il possède des sous-éléments";
-$lang["setup"][75] = "Comme fils de";
-$lang["setup"][76] = "Au même niveau que";
-$lang["setup"][77] = "Comme père de";
-$lang["setup"][78] = "Base de connaissances";
-$lang["setup"][79] = "Catégorie des suivis";
-$lang["setup"][80] = "Type de Tiers";
-
-$lang["setup"][100]="Configuration générale";
-$lang["setup"][101]="Chemin d'installation";
-$lang["setup"][102]="Niveau de log";
-$lang["setup"][103]="1- Critique (erreur de login seulement)";
-$lang["setup"][104]="2- Sévère (Non utilisée) ";
-$lang["setup"][105]="3- Important (logins réussis) ";
-$lang["setup"][106]="4- Notices (Ajout, suppression, tracking)";
-$lang["setup"][107]="5- Complet (Tout) ";
-$lang["setup"][108]="Nombre d'événements de log à afficher";
-$lang["setup"][109]="Temps en jours de conservation des logs (0 pour infini)";
-$lang["setup"][110]=" Montrer les interventions au login";
-$lang["setup"][111]="Nombre d'éléments à afficher par page";
-$lang["setup"][112]="Nombre de caractères maximum pour chaque éléments de la liste";
-$lang["setup"][113]="Langue par défaut";
-$lang["setup"][114]="Couleurs des priorités";
-
-$lang["setup"][150]="Sources d'authentification externes";
-$lang["setup"][151]=" Si vous ne souhaitez pas utiliser LDAP comme source(s) de connexion laissez les champs vides";
-$lang["setup"][152]="LDAP configuration";
-$lang["setup"][153]="Hote LDAP ";
-$lang["setup"][154]="Basedn";
-$lang["setup"][155]="rootdn (pour les connexions non anonymes)";
-$lang["setup"][156]="Pass (pour les connexions non anonymes)";
-$lang["setup"][157]="L'extension LDAP de votre parser PHP n'est pas installé";
-$lang["setup"][158]="Impossible d'utiliser LDAP comme source de connexion externe";
-$lang["setup"][159]="Filtre de connexion";
-
-$lang["setup"][160]=" Si vous ne souhaitez pas utiliser IMAP/POP comme source(s) de connexion laissez les champs vides. Plus d'informations sur <a target=\"_blank\" href=\"http://www.php.net/manual/fr/function.imap-open.php\";>php.net</a>.";
-$lang["setup"][161]="";
-$lang["setup"][162]="IMAP/POP configuration";
-$lang["setup"][163]="Serveur IMAP/POP";
-$lang["setup"][164]="Nom domaine IMAP/POP <br>(email de type [EMAIL PROTECTED])";
-$lang["setup"][165]="Votre parser PHP a été compilé sans les fonctions de connexion IMAP";
-$lang["setup"][166]="Impossible d'utiliser IMAP/POP comme source de connexion externe";
-$lang["setup"][167]="Liaisons GLPI/LDAP";
-$lang["setup"][168]="Options de connexion";
-$lang["setup"][169]="Boîte Mail (optionnel)";
-$lang["setup"][170]="Chaîne de connexion obtenue";
-$lang["setup"][171]="Port (optionnel)";
-
-$lang["setup"][200]="Suivis par emails";
-$lang["setup"][201]="Configuration de la fonction";
-$lang["setup"][202]="Utiliser le suivi par mail";
-$lang["setup"][203]="Mail de l'administrateur";
-$lang["setup"][204]="Signature des messages";
-$lang["setup"][205]="Options de configuration";
-$lang["setup"][206]="Envois à l'administrateur";
-$lang["setup"][207]="Envois à tous les utilisateurs de type 'admin'";
-$lang["setup"][208]="Envois à tous les utilisateurs de type 'normal'";
-$lang["setup"][209]="Envois au responsable de la tâche";
-$lang["setup"][210]="Envois au demandeur";
-$lang["setup"][211]="A chaque nouvelle intervention";
-$lang["setup"][212]="Pour chaque nouveau suivi";
-$lang["setup"][213]="A la fermeture d'une intervention";
-$lang["setup"][214]="A la création de ces demandes d'interventions";
-$lang["setup"][215]="Pour chaque nouveau suivi le concernant";
-$lang["setup"][216]="A la fermeture d'une intervention le concernant";
-$lang["setup"][217]="La fonction mail n'existe pas ou est désactivée sur votre système";
-$lang["setup"][218]="Impossible de configurer les envois de suivis par mails";
-$lang["setup"][219]="Voulez vous permettre les soumissions d'intervention anonymes (helpdesk.html)";
-$lang["setup"][220]="Impossible de modifier l'utilisateur 'Helpdesk'";
-
-
-// Helpdesk
-
-$lang["help"][0] = "Bienvenue";
-$lang["help"][1] = "Veuillez décrire votre problème";
-$lang["help"][2] = "Le problème doit être résolu";
-$lang["help"][3] = "Hier";
-$lang["help"][4] = "Tres vite";
-$lang["help"][5] = "Dans la journée";
-$lang["help"][6] = "La semaine prochaine";
-$lang["help"][7] = "Si vous avez le temps";
-$lang["help"][8] = "Informez-moi des suites données";
-$lang["help"][9] = "Non";
-$lang["help"][10] = "Oui";
-$lang["help"][11] = "Mon adresse de messagerie";
-$lang["help"][12] = "Le Numéro du matériel :";
-$lang["help"][13] = "Le problème";
-$lang["help"][14] = "Envoyer message";
-$lang["help"][15] = "Pas de description, réessayez.";
-$lang["help"][16] = "Vous voulez être informées des suites données mais vous n'avez pas entré d'adresse de messagerie !";
-$lang["help"][17] = "Veuillez saisir votre numéro de matériel.";
-$lang["help"][18] = "Votre signalement a été envoyé, le traitement est en cours.";
-$lang["help"][19] = "Merci d'avoir utilisé notre systeme d'aide automatique.";
-$lang["help"][20] = "Votre problème ne peut pas être ajouté dans notre base de données.";
-$lang["help"][21] = "Veuillez prendre contact avec un technicien. SVP";
-$lang["help"][22] = "Rechercher votre numéro du matériel";
-$lang["help"][23] = "Saisissez les premières lettres (nom, matériel ou n° de série)";
-$lang["help"][24] = "Type d'intervention";
-$lang["help"][25] = "Ordinateur";
-$lang["help"][26] = "Matériel réseau";
-$lang["help"][27] = "Imprimante";
-$lang["help"][28] = "Moniteur";
-$lang["help"][29] = "Périphérique";
-$lang["help"][30] = "Général";
-$lang["help"][31] = "Logiciel";
-
- // Mois
- $lang["calendarM"][0] = "Janvier" ;
- $lang["calendarM"][1] = "Février" ;
- $lang["calendarM"][2] = "Mars" ;
- $lang["calendarM"][3] = "Avril" ;
- $lang["calendarM"][4] = "Mai" ;
- $lang["calendarM"][5] = "Juin" ;
- $lang["calendarM"][6] = "Juillet" ;
- $lang["calendarM"][7] = "Août" ;
- $lang["calendarM"][8] = "Septembre" ;
- $lang["calendarM"][9] = "Octobre" ;
- $lang["calendarM"][10] = "Novembre" ;
- $lang["calendarM"][11] = "Décembre" ;
-
- // Première lettre des jours de la semaine
- $lang["calendarD"][0] = "D" ;
- $lang["calendarD"][1] = "L" ;
- $lang["calendarD"][2] = "M" ;
- $lang["calendarD"][3] = "M" ;
- $lang["calendarD"][4] = "J" ;
- $lang["calendarD"][5] = "V" ;
- $lang["calendarD"][6] = "S" ;
-
- // Mail ne pas mettre au format html !!!!
-
-$lang["mailing"][0]="-----------------------";
-$lang["mailing"][1]="=======================================";
-$lang["mailing"][2]="Auteur : ";
-$lang["mailing"][3]="Contenu : ";
-$lang["mailing"][4]="Intervention(s) déjà effectuée(s)";
-$lang["mailing"][5]="Description de l'intervention";
-$lang["mailing"][6]="Date de début : ";
-$lang["mailing"][7]="Ordinateur concerné : ";
-$lang["mailing"][8]="Attribué à : ";
-$lang["mailing"][9]="Nouvelle demande d'intervention";
-$lang["mailing"][10]="Nouveau suivi d'intervention";
-$lang["mailing"][11]="Intervention terminée le ";
-$lang["mailing"][12]="Attribution de l'intervention";
-$lang["mailing"][13]="Erreur dans la génération de l'email automatique";
-$lang["mailing"][14]="Changement de catégorie de l'intervention";
-$lang["mailing"][15]="Changement de priorité de l'intervention";
-
-
-//Les stats
-$lang["stats"][0] = "Sélectionnez les statistiques à visualiser";
-$lang["stats"][1] = "Globales";
-$lang["stats"][2] = "Par technicien";
-$lang["stats"][3] = "Par Intitulés";
-$lang["stats"][4] = "Par utilisateur";
-$lang["stats"][5] = "Nombre total d'interventions";
-$lang["stats"][6] = "Délai moyen de résolution de panne";
-$lang["stats"][7] = "Délai maximal de résolution de panne";
-$lang["stats"][8] = "Ce mois ci";
-$lang["stats"][9] = "Cette année";
-$lang["stats"][10] = "Au total";
-$lang["stats"][11] = "Nombre d'interventions résolues";
-$lang["stats"][12] = "Statistiques Globales";
-$lang["stats"][13] = "Nombre d'interventions attribuées";
-$lang["stats"][14] = "Nombre d'interventions résolues";
-$lang["stats"][15] = "durée moyenne d'ouverture";
-$lang["stats"][16] = "Nom du technicien";
-$lang["stats"][17] = "Statistiques techniciens";
-$lang["stats"][18] = "Statistiques utilisateurs";
-$lang["stats"][19] = "Statistiques";
-$lang["stats"][20] = "Nom d'utilisateur";
-$lang["stats"][21] = "Lieu";
-$lang["stats"][22] = "Nombre d'interventions demandées";
-$lang["stats"][23] = "Pas de statistiques disponibles";
-$lang["stats"][25] = "Durée réelle moyenne de l'intervention";
-$lang["stats"][26] = "Types";
-$lang["stats"][27] = "Durée réelle totale des interventions";
-$lang["stats"][28] = "Durée maximale de résolution réelle de panne";
-$lang["stats"][29] = "Délai minimum de prise en compte de l'intervention";
-$lang["stats"][30] = "Délai moyen de prise en compte de l'intervention";
-$lang["stats"][31] = "Jour(s)";
-$lang["stats"][32] = "Heure(s)";
-$lang["stats"][33] = "Min(s)";
-$lang["stats"][34] = "Sec(s)";
-$lang["stats"][35] = "Intervention(s)";
-// install update
-
-$lang["install"][0] = "Installation ou mise à jour de GLPI";
-$lang["install"][1] = " Choissisez \"Installation\" pour une nouvelle installation complète de GLPI ( les données importées par GLPI seront les données par défaut).";
-$lang["install"][2] = "Choisissez \" Mise à jour\" pour mettre à jour GLPI à partir d'une version antérieure";
-$lang["install"][3] = "Installation";
-$lang["install"][4] = "Mise à jour";
-$lang["install"][5] = "Vérification de la compatibilité de votre environnement avec l'execution de GLPI";
-$lang["install"][6] = "Test effectué";
-$lang["install"][7] = "Résultats";
-$lang["install"][8] = "Test du Parser PHP";
-$lang["install"][9] = "Vous devez installer PHP4 Vous pouvez le télécharger ici :";
-$lang["install"][10] = "Vous utilisez une des versions 4.0.0 ou 4.0.1 de PHP - Nous vous conseillons de mettre à jour votre PHP";
-$lang["install"][11] = "La version de PHP est 4.x - Parfait !";
-$lang["install"][12] = "Test des Sessions";
-$lang["install"][13] = "Votre parser PHP n'as pas été compilé avec le support des sessions ! ";
-$lang["install"][14] = "Le support des sessions est opérationnel - Parfait !";
-$lang["install"][15] = "Vérifiez que le support des sessions est bien activé dans votre php.ini";
-$lang["install"][16] = "Tests d'écriture de fichiers dump";
-$lang["install"][17] = "Le fichier n'a pas pu être créé.";
-$lang["install"][18] = "Vérifiez que PHP a un droit d'écriture pour le répertoire : 'backups/dump/'. Si vous êtes sous un environnement de Microsoft Windows, regardez si c'est en lecture seule.";
-$lang["install"][19] = "Le fichier a été créé mais n'a pas pu être supprimé.";
-$lang["install"][20] = "Le fichier a été créé et supprimé - Parfait !";
-$lang["install"][21] = "Test d'écriture de fichiers temporaires";
-$lang["install"][22] = "Vérifiez que PHP a un droit d'écriture pour le répertoire : 'reports/reports/convexcel/tmp/'. Si vous êtes sous un environnement de Microsoft Windows, regardez si c'est en lecture seule.";
-$lang["install"][23] = "Test d'écriture de fichier configuration";
-$lang["install"][24] = "Vérifiez que PHP a un droit d'écriture pour le répertoire : 'glpi/config/'. Si vous êtes sous un environnement de Microsoft Windows, regardez si c'est en lecture seule.";
-$lang["install"][25] = "Continuer ?";
-$lang["install"][26] = "Continuer";
-$lang["install"][27] = "Réessayer";
-$lang["install"][28] = "Configuration de la connexion à la base de données";
-$lang["install"][29] = "Paramètres de connexion à la base de données";
-$lang["install"][30] = "Mysql server";
-$lang["install"][31] = "Mysql user";
-$lang["install"][32] = "Mysql pass";
-$lang["install"][33] = "Retour";
-$lang["install"][34] = "Test de la connexion à la base de données";
-$lang["install"][35] = "Impossible de se connecter à la base de données";
-$lang["install"][36] = " Le serveur a répondu";
-$lang["install"][37] = "Le champs serveur ou/et le champ user est vide";
-$lang["install"][38] = "Veuillez selectionner une base de données : ";
-$lang["install"][39] = "Créer une nouvelle base :";
-$lang["install"][40] = "Veuillez selectionner la base de données à mettre à jour : ";
-$lang["install"][41] = "Impossible d'utiliser la base : ";
-$lang["install"][42] = "";
-$lang["install"][43] = "OK - La base a bien été initialisée";
-$lang["install"][44] = "Des valeurs par défaut ont été entrées, n'hésitez pas à supprimer ces dernières";
-$lang["install"][45] = "Ne supprimez pas l'utilisateur 'helpdesk' ";
-$lang["install"][46] = "A la première connexion vous pouvez utiliser le login \"glpi\" et le mot de passe \"glpi\" pour accéder à l'application avec des droits administrateur";
-$lang["install"][47] = "Impossible d'écrire le fichier de configuration de votre base de données";
-$lang["install"][48] = "Erreur lors de la création de la base !";
-$lang["install"][49] = "Vous n'avez pas sélectionné de base de données !";
-$lang["install"][50] = "";
-$lang["install"][51] = "Configuration de GLPI :";
-$lang["install"][52] = "Les valeurs présélectionnées sont les valeurs par defaut, il est recommandé de laisser ces valeurs";
-$lang["install"][53] = "Votre configuration a bien été enregistrée";
-$lang["install"][54] = "Cliquez sur 'Continue' pour terminer l'installation";
-$lang["install"][55] = "L'installation est terminée";
-$lang["install"][56] = "Il est recommandé maintenant d'appliquer un chmod+0 sur les fichiers install.php et update.php";
-$lang["install"][57] = "Les logins mots de passes par defauts sont :";
-$lang["install"][58] = "glpi/glpi pour le compte administrateur";
-$lang["install"][59] = "tech/tech pour le compte technicien";
-$lang["install"][60] = "normal pour le compte normal";
-$lang["install"][61] = "post-only/post-only pour le compte postonly";
-$lang["install"][62] = "Vous pouvez supprimer ou modifier ces comptes ainsi que les premières entrées dans la base de données.";
-$lang["install"][63] = "Attention tout de même NE SUPPRIMEZ PAS l'utilisateur HELPDESK.";
-$lang["install"][64] = "Utiliser GLPI";
-$lang["install"][65] = "Test sur l'extension magic_quotes_sybase";
-$lang["install"][66] = "GLPI ne peux pas fonctionner avec l'option magic_quotes_sybase ; Veuillez désactiver cette option et réessayer";
-$lang["install"][67] = "L'option magic_quotes_sybase n'est pas utilisée par votre serveur - Parfait !";
-$lang["install"][70] = "Impossible de créer le fichier de connexion à la base de données, vérifiez les droits sur les fichiers";
-$lang["install"][71] = "Test de l'extension mysql.";
-$lang["install"][72] = "Vous devez compiler votre php avec l'extension Mysql.";
-$lang["install"][73] = "Ok - la fonction mysql_connect() existe - Parfait !";
-
-$lang["update"][90] ="Erreur durant la mise à jour de la base de données";
-$lang["update"][91] ="Attention ! ";
-$lang["update"][92] ="Vous allez mettre à jour votre base de données GLPI ayant pour nom :";
-$lang["update"][93] ="Connexion à la base de données réussie";
-$lang["update"][94] ="La mise à jour est réussie, votre base de données est actualisée";
-$lang["update"][95] ="La connexion à la base de données a échouée, verifiez les paramètres de connexion figurant dans le fichier config_db.php";
-$lang["update"][96] = "Tous vos utilisateurs ayant précedement les droits \"admin\" se sont vu attribuer les droits \"super-admin\" avec l'ajout de ce nouveau type d'utilisateur";
-$lang["update"][97] = "La base de données que vous venez de mettre à jour ne contient aucun utilisateur \"super-admin\"";
-$lang["update"][98] = "Vous devez en créer un absolument afin de pouvoir re-configurer l'application (notamment les accès aux sources de données externes)";
-$lang["update"][99] = "Vous pourrez supprimer cet utilisateur une fois que vous aurez configuré l'application";
-$lang["update"][100] = "Entrez le login";
-$lang["update"][101] = "Entrez le mot de passe";
-$lang["update"][102] = "Re-entrez le mot de passe";
-$lang["update"][103] = "Le Login ou le mot de passe sont vides, ou vous avez saisi deux mots de passes différents";
-$lang["update"][104] = "Utilisateur bien enregistré vous pouvez vous connecter à l'application";
-$lang["update"][105] = "Impossible d'accéder à la mise à jour de cette façon !!";
-$lang["update"][106] = "Retourner à GLPI";
-$lang["update"][107] = "Vous devez maintenant procéder à la mise à jour de l'ancien contenu de votre base de données";
-$lang["update"][108] = "La mise à jour du contenu ne semble pas nécessaire.";
-$lang["update"][109] = "Voulez vous tout de même la faire ?";
-$lang["update"][110] = "La mise à jour semble nécessaire.";
-
-
-$lang["reservation"][0] = "Réservations";
-$lang["reservation"][1] = "Matériel réservable";
-$lang["reservation"][2] = "ID";
-$lang["reservation"][3] = "Type matériel";
-$lang["reservation"][4] = "Matériel en prêt";
-$lang["reservation"][5] = "En prêt";
-$lang["reservation"][6] = "Ne pas autoriser le prêt";
-$lang["reservation"][7] = "Autoriser le prêt";
-$lang["reservation"][8] = "Réserver";
-$lang["reservation"][9] = "Réserver un matériel";
-$lang["reservation"][10] = "Date Début";
-$lang["reservation"][11] = "Date Fin";
-$lang["reservation"][12] = "Heure Début";
-$lang["reservation"][13] = "Heure Fin";
-$lang["reservation"][14] = "Supprimer réservation";
-$lang["reservation"][15] = "Journée";
-$lang["reservation"][16] = "Jusqu'à";
-$lang["reservation"][17] = "Dès";
-$lang["reservation"][18] = "Le matériel demandé est déjà réservé pour cette plage.";
-$lang["reservation"][19] = "Erreur dans l'entrée de vos dates. La date de début est surement supérieure à la date de fin";
-$lang["reservation"][20] = "Retour au calendrier";
-$lang["reservation"][21] = "Voir les réservations";
-$lang["reservation"][22] = "Modifier le commentaire";
-$lang["reservation"][23] = "Commentaire";
-$lang["reservation"][24] = "Prêt";
-$lang["reservation"][25] = "Tous les matériels en prêt";
-$lang["reservation"][26] = "Voir tous";
-$lang["reservation"][27] = "Périodicité";
-$lang["reservation"][28] = "Par semaine";
-$lang["reservation"][29] = "Par jour";
-$lang["reservation"][30] = "fois";
-$lang["reservation"][31] = "Par";
-$lang["reservation"][32] = "Editer réservation";
-
-$lang["knowbase"][0] ="Base de connaissances";
-$lang["knowbase"][1] ="FAQ";
-$lang["knowbase"][2] ="Ajouter un item à la base de connaissances";
-$lang["knowbase"][3] ="Question";
-$lang["knowbase"][4] ="Réponse";
-$lang["knowbase"][5] ="Placer cet item dans la FAQ publique";
-$lang["knowbase"][6] ="Sélectionner une catégorie pour cet item : ";
-$lang["knowbase"][7] ="Retirer cet item de la FAQ publique";
-$lang["knowbase"][8] ="Modifier cet item ";
-$lang["knowbase"][9] ="Supprimer cet item ";
-$lang["knowbase"][10] ="Cet item fait partie de la FAQ publique ";
-$lang["knowbase"][11] ="Cet item ne fait pas partie de la FAQ publique ";
-$lang["knowbase"][12] ="Racine ";
-$lang["knowbase"][13] ="Nom de la catégorie ";
-$lang["knowbase"][14] ="Sous catégorie de ... ";
-$lang["knowbase"][15] ="Ajouter une nouvelle catégorie ";
-$lang["knowbase"][16] ="Ajout de la nouvelle catégorie ";
-$lang["knowbase"][17] ="Modification de la catégorie ";
-$lang["knowbase"][18] ="Supression de la catégorie ";
-$lang["knowbase"][19] ="Echec de la suppression : Cette catégorie contient des items, vous devez effacer tous les items de cette catégorie avant de la supprimer ";
-$lang["knowbase"][20] ="Base de connaissances vide";
-$lang["knowbase"][21] ="Tout déplier";
-$lang["knowbase"][22] ="Tout replier";
-
-$lang["toolbar"][0]="";
-$lang["toolbar"][1]="Gras";
-$lang["toolbar"][2]="Italique";
-$lang["toolbar"][3]="Souligné";
-$lang["toolbar"][4]="Barré";
-$lang["toolbar"][5]="Centré";
-$lang["toolbar"][6]="Code";
-$lang["toolbar"][7]="Titre";
-$lang["toolbar"][8]="Rouge";
-$lang["toolbar"][9]="Bleu";
-$lang["toolbar"][10]="Jaune";
-
-
-$lang["title"][0] = "Centre de contrôle";
-$lang["title"][1] = "Accès au Helpdesk seulement";
-$lang["title"][2] = "Configuration";
-$lang["title"][3] = "Ordinateurs";
-$lang["title"][4] = "Helpdesk";
-$lang["title"][5] = "Base de connaissances";
-$lang["title"][6] = "Matériel Réseau";
-$lang["title"][7] = "Périphériques";
-$lang["title"][8] = "Imprimantes";
-$lang["title"][9] = "Réservation";
-$lang["title"][10] = "Suivi d'intervention";
-$lang["title"][11] = "Statistiques";
-$lang["title"][12] = "Logiciels";
-$lang["title"][13] = "Informations Utilisateur";
-$lang["title"][14] = "Sources d'authentification externes";
-$lang["title"][15] = "Mailing";
-$lang["title"][16] = "Rapports";
-$lang["title"][17] = "Préférences";
-$lang["title"][18] = "Ecrans";
-$lang["title"][19] = "Cartouches";
-$lang["title"][20] = "Contrats";
-$lang["title"][21] = "Infos Commerciales";
-$lang["title"][22] = "Contacts";
-$lang["title"][23] = "Entreprises";
-$lang["title"][24] = "Assistance";
-
-$lang["device_hdd"][0] = "Rpm";
-$lang["device_hdd"][1] = "Cache";
-$lang["device_hdd"][2] = "Interface";
-$lang["device_hdd"][3] = "";
-$lang["device_hdd"][4] = "Capacité";
-$lang["device_hdd"][5] = "Commentaire";
-
-
-$lang["device_iface"][0] = "Debit";
-$lang["device_iface"][1] = "Commentaire";
-$lang["device_iface"][2] = "Adresse Mac";
-
-
-$lang["device_gfxcard"][0] = "memoire";
-$lang["device_gfxcard"][1] = "Commentaire";
-$lang["device_gfxcard"][2] = "interface";
-
-
-$lang["device_moboard"][0] = "Chipset";
-$lang["device_moboard"][1] = "Commentaire";
-
-
-$lang["device_processor"][0] = "Frequence";
-$lang["device_processor"][1] = "";
-$lang["device_processor"][2] = "";
-$lang["device_processor"][3] = "Commentaire";
-
-
-$lang["device_ram"][0] = "Type";
-$lang["device_ram"][1] = "Frequence";
-$lang["device_ram"][2] = "Commentaire";
-
-
-$lang["device_sndcard"][0] = "Type";
-$lang["device_sndcard"][1] = "Commentaire";
-$lang["device_sndcard"][2] = "";
-
-$lang["devices"][0] = "Ajouter un nouveau periphérique interne";
-$lang["devices"][1] = "Disque dur";
-$lang["devices"][2] = "Carte graphique";
-$lang["devices"][3] = "Interface reseau";
-$lang["devices"][4] = "Processeur";
-$lang["devices"][5] = "Carte mère";
-$lang["devices"][6] = "Memoire vive";
-$lang["devices"][7] = "Carte son";
-$lang["devices"][8] = "Désignation";
-$lang["devices"][9] = "Ajout d'un nouveau periphérique interne pour l'ordinateur: ";
-$lang["devices"][10] = "Périphériques Internes ";
-
-$lang["cartridges"][0] = "Cartouche";
-$lang["cartridges"][1] = "Nom";
-$lang["cartridges"][2] = "Référence";
-$lang["cartridges"][3] = "Type";
-$lang["cartridges"][4] = "ID";
-$lang["cartridges"][5] = "Commentaire";
-$lang["cartridges"][6] = "Ajouter Type de Cartouche...";
-$lang["cartridges"][7] = "Pas de cartouche trouvée";
-$lang["cartridges"][8] = "Fabriquant";
-$lang["cartridges"][9] = "Aucune cartouche";
-$lang["cartridges"][10] = "Toner";
-$lang["cartridges"][11] = "Jet-Encre";
-$lang["cartridges"][12] = "Type de Cartouche";
-$lang["cartridges"][13] = "Neuve(s)";
-$lang["cartridges"][14] = "Utilisée(s)";
-$lang["cartridges"][15] = "Vieille(s)";
-$lang["cartridges"][16] = "Cartouche(s)";
-$lang["cartridges"][17] = "Ajouter cartouche...";
-$lang["cartridges"][18] = "Ajouter Cartouche";
-$lang["cartridges"][19] = "Modifier Cartouche";
-$lang["cartridges"][20] = "Neuve";
-$lang["cartridges"][21] = "Utilisée";
-$lang["cartridges"][22] = "Vieille";
-$lang["cartridges"][23] = "Etat";
-$lang["cartridges"][24] = "Date ajout";
-$lang["cartridges"][25] = "Date utilisation";
-$lang["cartridges"][26] = "Date Fin";
-$lang["cartridges"][27] = "Sur";
-$lang["cartridges"][28] = "Installer";
-$lang["cartridges"][29] = "Fin de vie";
-$lang["cartridges"][30] = "Total";
-$lang["cartridges"][31] = "Supprimer";
-$lang["cartridges"][32] = "Type d'imprimantes compatibles";
-$lang["cartridges"][33] = "Cartouches utilisées";
-$lang["cartridges"][34] = "Pas de cartouche libre";
-$lang["cartridges"][35] = "Vieilles Cartouches";
-$lang["cartridges"][36] = "Lieu Stockage";
-
-$lang["financial"][0] = "Ajouter Contrat...";
-$lang["financial"][1] = "Contrat";
-$lang["financial"][2] = "Ajouter Infos Commerciales...";
-$lang["financial"][3] = "Informations Commerciales";
-$lang["financial"][4] = "Numéro";
-$lang["financial"][5] = "Coût";
-$lang["financial"][6] = "Type de contrat";
-$lang["financial"][7] = "Date début";
-$lang["financial"][8] = "Durée";
-$lang["financial"][9] = "an(s)";
-$lang["financial"][10] = "Préavis";
-$lang["financial"][11] = "Type de Facturation";
-$lang["financial"][12] = "Commentaires";
-$lang["financial"][13] = "Numéro comptable";
-$lang["financial"][14] = "Date d'achat";
-$lang["financial"][15] = "Durée garantie";
-$lang["financial"][16] = "Informations garantie";
-$lang["financial"][17] = "Tiers";
-$lang["financial"][18] = "Numéro de commande";
-$lang["financial"][19] = "Bon de livraison";
-$lang["financial"][20] = "Numéro d'immobilisation";
-$lang["financial"][21] = "Valeur";
-$lang["financial"][22] = "Type d'amortissement";
-$lang["financial"][23] = "Durée d'amortissement";
-$lang["financial"][24] = "Ajouter Contact...";
-$lang["financial"][25] = "Ajouter Entreprise...";
-$lang["financial"][26] = "Entreprise";
-$lang["financial"][27] = "Nom";
-$lang["financial"][28] = "ID";
-$lang["financial"][29] = "Téléphone";
-$lang["financial"][30] = "Fax";
-$lang["financial"][31] = "Email";
-$lang["financial"][32] = "Contact";
-$lang["financial"][33] = "Ajouter un Contact";
-$lang["financial"][34] = "Ajouter une Entreprise";
-$lang["financial"][35] = "Ajouter une Information Commerciale";
-$lang["financial"][36] = "Ajouter un Contrat";
-$lang["financial"][37] = "Type";
-$lang["financial"][38] = "Pas de contact trouvé";
-$lang["financial"][39] = "Pas d'entreprise trouvée";
-$lang["financial"][40] = "Pas de contrat trouvé";
-$lang["financial"][41] = "Pas d'Information Commerciale trouvée";
-$lang["financial"][42] = "Commercial";
-$lang["financial"][43] = "Technicien";
-$lang["financial"][44] = "Adresse";
-$lang["financial"][45] = "Site Web";
-$lang["financial"][46] = "Contacts associés";
-$lang["financial"][47] = "Linéaire";
-$lang["financial"][48] = "Dégressif";
-$lang["financial"][49] = "Eléments associés";
-$lang["financial"][50] = "Prêt";
-$lang["financial"][51] = "Location";
-$lang["financial"][52] = "Leasing";
-$lang["financial"][53] = "Assurances";
-$lang["financial"][54] = "Maintenace Hardware";
-$lang["financial"][55] = "Maintenance Software";
-$lang["financial"][56] = "Prestation";
-$lang["financial"][57] = "mois";
-$lang["financial"][58] = "Facturation";
-$lang["financial"][59] = "Heures d'intervention";
-$lang["financial"][60] = "en semaine";
-$lang["financial"][61] = "le samedi";
-$lang["financial"][62] = "dimanche et fêtes";
-$lang["financial"][63] = "Début";
-$lang["financial"][64] = "Fin";
-$lang["financial"][65] = "Entreprises associées";
-$lang["financial"][66] = "Contrats associés";
-$lang["financial"][67] = "Informations Commerciales associées";
-$lang["financial"][68] = "Activer les informations commerciales";
-$lang["financial"][69] = "Périodicté";
-$lang["financial"][70] = "Mensuel";
-$lang["financial"][71] = "Bimensuel";
-$lang["financial"][72] = "Trimestriel";
-$lang["financial"][73] = "Semestriel";
-$lang["financial"][74] = "Annuel";
-$lang["financial"][75] = "Bi-annuel";
-$lang["financial"][76] = "Date de mise en service";
-$lang["financial"][77] = "Coefficient d'amortissement";
-$lang["financial"][78] = "Valeur extension garantie";
-$lang["financial"][79] = "Type de Tiers";
-
-$lang["financial"][80] = "Expiration garantie";
-$lang["financial"][81] = "Valeur nette comptable";
-
-?>
\ Pas de fin de ligne à la fin du fichier.
diff -Nur web/glpi/glpi/glpi/dicts/.#french.php.1.172 glpi/glpi/dicts/.#french.php.1.172
--- web/glpi/glpi/glpi/dicts/.#french.php.1.172 2005-03-04 12:33:19.000000000 +0100
+++ glpi/glpi/dicts/.#french.php.1.172 1970-01-01 01:00:00.000000000 +0100
@@ -1,1192 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License (GPL)
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- To read the license please visit http://www.gnu.org/copyleft/gpl.html
- ----------------------------------------------------------------------
-*/
-
-// Based on:
-// IRMA, Information Resource-Management and Administration
-// Christian Bauer
-// ----------------------------------------------------------------------
-// Original Author of file:
-// Purpose of file:
-// ----------------------------------------------------------------------
-
-
-// French test Dictionary
-$lang["common"][0] = "Sans nom";
-$lang["common"][1] = "Matériel";
-$lang["common"][2] = "ID";
-$lang["common"][3] = "Supprimés";
-$lang["common"][4] = "Web";
-$lang["common"][5] = "Fabriquant";
-
-
-//Login
-
-$lang["login"][0] = "Login impossible, vérifiez que votre navigateur accepte les cookies.";
-$lang["login"][1] = "Se reloguer";
-$lang["login"][2] = "Votre mot de passe n'est plus valide... Si vous venez de le changer reloguez vous avec le nouveau";
-$lang["login"][3] = "Non loggué";
-$lang["login"][4] = "Mauvais mot de passe";
-$lang["login"][5] = "Accés refusé";
-
-
-
-// Global
-$lang["buttons"][0] = "Rechercher";
-$lang["buttons"][1] = "Liste";
-$lang["buttons"][2] = "Valider";
-$lang["buttons"][3] = "Attribuer";
-$lang["buttons"][4] = "Installer";
-$lang["buttons"][5] = "Désinstaller";
-$lang["buttons"][6] = "Supprimer";
-$lang["buttons"][7] = "Actualiser";
-$lang["buttons"][8] = "Ajouter";
-$lang["buttons"][9] = "Connecter";
-$lang["buttons"][10] = "Déconnecter";
-$lang["buttons"][11] = "Suivant";
-$lang["buttons"][12] = "Précédent";
-$lang["buttons"][13] = "Retour";
-$lang["buttons"][14] = "Modifier";
-$lang["buttons"][15] = "Calendrier";
-$lang["buttons"][16] ="Raz";
-$lang["buttons"][17] ="Supprimer";
-$lang["buttons"][18] ="Tout cocher";
-$lang["buttons"][19] ="Tout décocher";
-$lang["buttons"][20] ="Déplacer";
-$lang["buttons"][21] ="Restaurer";
-$lang["buttons"][22] ="Purger";
-
-$lang["choice"][0] = "Oui";
-$lang["choice"][1] = "Non";
-
-$lang["search"][0] = "Rechercher ";
-$lang["search"][1] = "Où ce champ";
-$lang["search"][2] = "contient";
-$lang["search"][3] = "phrase exacte";
-$lang["search"][4] = "trié par";
-$lang["search"][5] = "Voir par lieu";
-$lang["search"][6] = "trié par";
-$lang["search"][7] = "Tous";
-$lang["search"][8] = "Date début";
-$lang["search"][9] = "Date fin";
-$lang["search"][10] = "dans";
-
-
-// Central
-$lang["central"][0] = "Bienvenue ";
-$lang["central"][1] = "vous êtes sur la console centrale.";
-$lang["central"][2] = "Derniers";
-$lang["central"][3] = "Evénements";
-$lang["central"][4] = "Pas d'événement";
-$lang["central"][5] = "Accueil";
-$lang["central"][6] = "Déconnexion";
-$lang["central"][7] = "Aide";
-
-
-//event
-$lang["event"][0] = "Item (ID)";
-$lang["event"][1] = "Date";
-$lang["event"][2] = "Service";
-$lang["event"][3] = "Niveau";
-$lang["event"][4] = "Message";
-
-// Pager
-$lang["pager"][1] = "à";
-$lang["pager"][2] = "de";
-$lang["pager"][3] = "sur";
-
-// Direct Connexions
-$lang["connect"][0] = "Connexions directes";
-$lang["connect"][1] = "non connecté";
-$lang["connect"][2] = "Connecter";
-$lang["connect"][3] = "Déconnecter";
-$lang["connect"][4] = "Faire une connexion directe";
-$lang["connect"][5] = "Sur un ordinateur qui";
-$lang["connect"][6] = "Nom";
-$lang["connect"][7] = "ID";
-$lang["connect"][8] = "contient";
-$lang["connect"][9] = "Choisissez un ordinateur dans la liste";
-$lang["connect"][10] = "Choisissez une imprimante dans la liste";
-$lang["connect"][11] = "Choisissez un périphérique dans la liste";
-$lang["connect"][12] = "Choisissez un écran dans la liste";
-$lang["connect"][13] = "Sur une imprimante qui";
-$lang["connect"][14] = "Sur un périphérique qui";
-$lang["connect"][15] = "Sur un écran qui";
-$lang["connect"][16] = "Aucun élément trouvé";
-$lang["connect"][17] = "Mise à jour automatique de la prise réseau qui n'était pas renseignée";
-$lang["connect"][18] = "Attention !! Les prises réseaux des deux matériels ne correspondent pas.";
-$lang["connect"][19] = "Mise à jour automatique de l'adresse IP qui n'était pas renseignée";
-$lang["connect"][20] = "Attention !! Les adresses IP des deux matériels ne correspondent pas.";
-$lang["connect"][21] = "Mise à jour automatique de l'adresse MAC qui n'était pas renseignée";
-$lang["connect"][22] = "Attention !! Les adresses MAC des deux matériels ne correspondent pas.";
-
-//header menu
-
-$lang["Menu"][0] = "Ordinateurs";
-$lang["Menu"][1] ="Réseaux";
-$lang["Menu"][2] ="Imprimantes";
-$lang["Menu"][3] ="Ecrans";
-$lang["Menu"][4] ="Logiciels";
-$lang["Menu"][5] ="Suivi";
-$lang["Menu"][6] ="Rapports";
-$lang["Menu"][7] ="Groupes";
-$lang["Menu"][8] ="Comptes";
-$lang["Menu"][9] ="Comptes mail";
-$lang["Menu"][10] ="Configuration";
-$lang["Menu"][11] ="Préferences";
-$lang["Menu"][12] ="Données";
-$lang["Menu"][13] ="Statistiques";
-$lang["Menu"][14] ="Utilisateurs";
-$lang["Menu"][15] ="Administration";
-$lang["Menu"][16] ="Périphériques";
-$lang["Menu"][17] ="Réservations";
-$lang["Menu"][18] ="Outils";
-$lang["Menu"][19] ="Base connaissances";
-$lang["Menu"][20] ="Fichiers configuration";
-$lang["Menu"][21] ="Cartouches";
-$lang["Menu"][22] ="Contacts";
-$lang["Menu"][23] ="Entreprises";
-$lang["Menu"][24] ="Infos commerciales";
-$lang["Menu"][25] ="Contrats";
-$lang["Menu"][26] ="Gestion";
-
-//Données
-
-$lang["backup"][0] ="Sauvegarde SQL";
-$lang["backup"][1] ="Sauvegarde XML";
-$lang["backup"][2] ="Sauvegarde de la base de données";
-$lang["backup"][3] ="Le fichier a bien été généré";
-$lang["backup"][5] ="Voir le fichier";
-$lang["backup"][6] ="Structure de la table";
-$lang["backup"][7] ="Données de la table";
-$lang["backup"][8] ="Restauré !";
-$lang["backup"][9] ="Supprimé !";
-$lang["backup"][10] ="Fichier";
-$lang["backup"][11] ="Taille";
-$lang["backup"][12] ="Date";
-$lang["backup"][13] ="Voir/Télécharger";
-$lang["backup"][14] ="Restaurer";
-$lang["backup"][15] ="Etes vous sur de vouloir sauvegarder la base de donnees";
-$lang["backup"][16] ="Etes vous certain de vouloir remplacer la base de donnees actuelle par le fichier de sauvegarde :";
-$lang["backup"][17] ="Etes vous certain de vouloir supprimer ce fichier";
-$lang["backup"][18] ="Etes vous certain de vouloir sauvegarder la base de donnees";
-$lang["backup"][19] ="Maintenant";
-$lang["backup"][20] ="Supp";
-
-// Tracking
-$lang["tracking"][0] = "Suivi des interventions";
-$lang["tracking"][1] = "Toutes les interventions actives";
-$lang["tracking"][2] = "Seulement les interventions qui vous sont attribuées";
-$lang["tracking"][3] = "Seulement les interventions non attribuées";
-$lang["tracking"][4] = "Seulement les interventions terminées";
-$lang["tracking"][5] = "Quand la description contient";
-$lang["tracking"][6] = "Vous n'etes pas autorisé à (re-)attribuer cette intervention";
-$lang["tracking"][7] = "Afficher...";
-$lang["tracking"][8] = "Pas de description, veuillez recommencer";
-$lang["tracking"][9] = "Nouvelle intervention postée, suivante...";
-$lang["tracking"][10] = "Ajout de l'intervention impossible, verifiez la base de données";
-$lang["tracking"][11] = "Intervention(s) requise(s) par cet utilisateur";
-$lang["tracking"][12] = "Tous les types de matériels";
-$lang["tracking"][13] = "Seulement les ordinateurs";
-$lang["tracking"][14] = "Seulement le matériel reseau";
-$lang["tracking"][15] = "Seulement les imprimantes";
-$lang["tracking"][16] = "Seulement les moniteurs";
-$lang["tracking"][17] = "Seulement les périphériques";
-$lang["tracking"][18] = "Seulement les logiciels";
-$lang["tracking"][19] = "Seulement Générales";
-$lang["tracking"][20] = "Catégorie";
-$lang["tracking"][21] = "Vous n'etes pas autorisé à modifier la catégorie de cette intervention";
-$lang["tracking"][22] = "Vous n'etes pas autorisé à modifier la priorité de cette intervention";
-
-// 1 computers
-// 2 networking
-// 3 printers
-// 4 monitors
-// 5 peripherals
-// 6 software
-
-$lang["joblist"][0] = "Statut";
-$lang["joblist"][1] = "Date";
-$lang["joblist"][2] = "Priorité";
-$lang["joblist"][3] = "Auteur";
-$lang["joblist"][4] = "Attribué";
-$lang["joblist"][5] = "Ordinateur";
-$lang["joblist"][6] = "Description";
-$lang["joblist"][7] = "Nouvelle intervention pour cet item...";
-$lang["joblist"][8] = "Pas d'intervention trouvée.";
-$lang["joblist"][9] = "Nouveau";
-$lang["joblist"][10] = "Ancien";
-$lang["joblist"][11] = "Ouvert le";
-$lang["joblist"][12] = "Fermé le";
-$lang["joblist"][13] = "Infos";
-$lang["joblist"][14] = "Terminer";
-$lang["joblist"][15] = "Attribuer";
-$lang["joblist"][16] = "Pas d'intervention en cours.";
-$lang["joblist"][17] = "Trés haute";
-$lang["joblist"][18] = "Haute";
-$lang["joblist"][19] = "Normale";
-$lang["joblist"][20] = "Basse";
-$lang["joblist"][21] = "Trés basse";
-$lang["joblist"][22] = "Pas d'ancienne intervention trouvée";
-$lang["joblist"][23] = "Rajouter une ancienne intervention à l'historique";
-
-$lang["job"][0] = "Numéro d'intervention";
-$lang["job"][1] = "Intervention toujours ouverte...";
-$lang["job"][2] = "Cette intervention a été ouverte à";
-$lang["job"][3] = "Intervention terminée, marquer comme ancienne.";
-$lang["job"][4] = "Attribuer intervention";
-$lang["job"][5] = "Attribuée à";
-$lang["job"][6] = "Attribuer";
-$lang["job"][7] = "Suivi";
-$lang["job"][8] = "Pas de suivi pour cette intervention.";
-$lang["job"][9] = "Envoyer un nouveau suivi pour cette intervention";
-$lang["job"][10] = "Pas de suivi pour cette intervention.";
-$lang["job"][11] = "Décrivez le probleme/action";
-$lang["job"][12] = "Pas de suivi pour cette intervention.";
-$lang["job"][13] = "Ajouter une nouvelle intervention";
-$lang["job"][14] = "Nouvelle intervention";
-$lang["job"][15] = "Historique";
-$lang["job"][16] = "trouvée ";
-$lang["job"][17] = "intervention";
-$lang["job"][18] = "ancienne";
-$lang["job"][19] = "Suivi par Email";
-$lang["job"][20] = "Durée réelle de l'intervention";
-$lang["job"][21] = "Heure(s)";
-$lang["job"][22] = "Minute(s)";
-$lang["job"][23] = "Restaurer cette intervention";
-$lang["job"][24] = "Catégorie de l'intervention";
-
-// Computers
-
-$lang["computers"][0] = "Ajouter ordinateur...";
-$lang["computers"][1] = "Identifiant";
-$lang["computers"][6] = "N° série";
-$lang["computers"][7] = "Nom";
-$lang["computers"][8] = "Type";
-$lang["computers"][9] = "OS";
-$lang["computers"][10] = "Lieu";
-$lang["computers"][11] = "Dernière modif";
-$lang["computers"][12] = "Nouvel ordinateur à partir d'un modèle";
-$lang["computers"][13] = "Ordinateur ID";
-$lang["computers"][14] = "Inseré";
-$lang["computers"][15] = "Contact numero";
-$lang["computers"][16] = "Contact";
-$lang["computers"][17] = "N° de série";
-$lang["computers"][18] = "N° d'inventaire";
-$lang["computers"][19] = "Commentaires";
-$lang["computers"][20] = "OS Version";
-$lang["computers"][21] = "CPU";
-$lang["computers"][22] = "MHZ";
-$lang["computers"][23] = "RAM Typ";
-$lang["computers"][24] = "RAM (MB)";
-$lang["computers"][25] = "HD (GB)";
-$lang["computers"][26] = "Carte réseau";
-$lang["computers"][27] = "Flags";
-$lang["computers"][28] = "Serveur";
-$lang["computers"][29] = ""; // reservé
-$lang["computers"][30] = ""; // reservé
-$lang["computers"][31] = "ID";
-$lang["computers"][32] = "Pas d'ordinateur trouvé";
-$lang["computers"][33] = "Carte son";
-$lang["computers"][34] = "Carte graphique";
-$lang["computers"][35] = "Carte mère";
-$lang["computers"][36] = "HD-Type";
-$lang["computers"][37] = "Pas d'écran connecté.";
-$lang["computers"][38] = "Pas d'imprimante connectée";
-$lang["computers"][39] = "Imprimantes";
-$lang["computers"][40] = "Ecrans";
-$lang["computers"][41] = "Date d'achat";
-$lang["computers"][42] = "Expiration garantie";
-$lang["computers"][43] = "Maintenance";
-$lang["computers"][44] = "Ordinateurs";
-$lang["computers"][45] = "Choisissez un modèle";
-$lang["computers"][46] = "Périphériques";
-$lang["computers"][47] = "Pas de périphérique connecté";
-$lang["computers"][48] = "Modification de lieu. Les éléments connectés ont été déplacés dans le même lieu.";
-$lang["computers"][49] = "Nom du modele";
-$lang["computers"][50] = "Responsable technique";
-// Networking
-
-$lang["networking"][0] = "Nom";
-$lang["networking"][1] = "Lieu";
-$lang["networking"][2] = "Type";
-$lang["networking"][3] = "Contact";
-$lang["networking"][4] = "Contact numero";
-$lang["networking"][5] = "RAM (MB)";
-$lang["networking"][6] = "Numéro série";
-$lang["networking"][7] = "Numéro d'inventaire";
-$lang["networking"][8] = "Commentaire";
-$lang["networking"][9] = "Dernière modification";
-$lang["networking"][10] = "";
-$lang["networking"][11] = "Ajouter Materiel réseau...";
-$lang["networking"][12] = "Materiel réseau";
-$lang["networking"][13] = "port(s) réseau trouvé(s)";
-$lang["networking"][14] = "IP";
-$lang["networking"][15] = "MAC";
-$lang["networking"][16] = "Interface";
-$lang["networking"][17] = "Connecté à";
-$lang["networking"][18] = "";
-$lang["networking"][19] = "Ajouter un port...";
-$lang["networking"][20] = "Port Manager";
-$lang["networking"][21] = "Logical Number";
-$lang["networking"][22] = "Interface Address";
-$lang["networking"][23] = "Interface MAC";
-$lang["networking"][24] = "Connexion";
-$lang["networking"][25] = "sur";
-$lang["networking"][26] = "Non connecté.";
-$lang["networking"][27] = "Port de connexion";
-$lang["networking"][28] = "(Etape 1)";
-$lang["networking"][29] = "A un ordinateur dont";
-$lang["networking"][30] = "contient";
-$lang["networking"][31] = "ou choisisez un materiel réseau";
-$lang["networking"][32] = "(Etape 2)";
-$lang["networking"][33] = "Choisissez un ordinateurs dans le resultat";
-$lang["networking"][34] = "Materiel non connecté : aucuns ports trouvés";
-$lang["networking"][35] = "(derniere etape)";
-$lang["networking"][36] = "Liste de tous ports sur la machine";
-$lang["networking"][37] = "Port trouvé";
-$lang["networking"][38] = "Pas de machine trouvée.";
-$lang["networking"][39] = "Date d'achat";
-$lang["networking"][40] = "Expiration garantie";
-$lang["networking"][41] = "Maintenance";
-$lang["networking"][42] = "identifiant";
-$lang["networking"][43] = "Réseau";
-$lang["networking"][44] = "Le port";
-$lang["networking"][45] = "est maintenant connecté sur le port";
-$lang["networking"][46] = "Ajouter plusieurs ports...";
-$lang["networking"][47] = "De";
-$lang["networking"][48] = "A";
-$lang["networking"][49] = "Firmware";
-$lang["networking"][50] = "ID";
-$lang["networking"][51] = "Prise reseau";
-$lang["networking"][52] = "N° Prise";
-$lang["networking"][53] = "Responsable technique";
-// Printers
-$lang["printers"][0] = "Ajouter imprimante...";
-$lang["printers"][1] = "Voir par lieu";
-$lang["printers"][2] = "trié par";
-$lang["printers"][3] = "Ajouter Imprimante";
-$lang["printers"][4] = "Imprimante";
-$lang["printers"][5] = "Nom";
-$lang["printers"][6] = "Lieu";
-$lang["printers"][7] = "contact numero";
-$lang["printers"][8] = "Contact Personne";
-$lang["printers"][9] = "Type";
-$lang["printers"][10] = "numero de série";
-$lang["printers"][11] = "numero d'inventaire";
-$lang["printers"][12] = "Commentaire";
-$lang["printers"][13] = "Lieu";
-$lang["printers"][14] = "Port série";
-$lang["printers"][15] = "Port parallèle";
-$lang["printers"][16] = "Dernière modification";
-$lang["printers"][17] = "Pas d'imprimante trouvée.";
-$lang["printers"][18] = "Flags";
-$lang["printers"][19] = "ID";
-$lang["printers"][20] = "Date d'achat ";
-$lang["printers"][21] = "Expiration garantie";
-$lang["printers"][22] = "Maintenance";
-$lang["printers"][23] = "Mémoire vive";
-$lang["printers"][24] = "Identifiant";
-$lang["printers"][25] = "Imprimantes";
-$lang["printers"][26] = "Nombre";
-$lang["printers"][27] = "Port USB";
-$lang["printers"][28] = "Responsable technique";
-// Monitors
-$lang["monitors"][0] = "Ajouter moniteur...";
-$lang["monitors"][3] = "Ajouter moniteur";
-$lang["monitors"][4] = "Moniteur";
-$lang["monitors"][5] = "Nom";
-$lang["monitors"][6] = "Lieu";
-$lang["monitors"][7] = "Contact numéro";
-$lang["monitors"][8] = "Contact";
-$lang["monitors"][9] = "Type";
-$lang["monitors"][10] = "Numéro de série";
-$lang["monitors"][11] = "Numéro d'inventaire";
-$lang["monitors"][12] = "Commentaire";
-$lang["monitors"][13] = "Lieu";
-$lang["monitors"][14] = "Microphone";
-$lang["monitors"][15] = "Enceintes";
-$lang["monitors"][16] = "Dernière modification";
-$lang["monitors"][17] = "Pas d'ecran trouvé.";
-$lang["monitors"][18] = "Options";
-$lang["monitors"][19] = "Sub-D";
-$lang["monitors"][20] = "BNC";
-$lang["monitors"][21] = "Taille";
-$lang["monitors"][22] = "Connecté a";
-$lang["monitors"][23] = "ID";
-$lang["monitors"][24] = "Date d'achat ";
-$lang["monitors"][25] = "Expiration garantie";
-$lang["monitors"][26] = "Maintenance";
-$lang["monitors"][27] = "identifiant";
-$lang["monitors"][28] = "Ecrans";
-$lang["monitors"][29] = "Responsable technique";
-// Software
-$lang["software"][0] = "Ajouter logiciel...";
-$lang["software"][1] = "ID";
-$lang["software"][2] = "Nom";
-$lang["software"][3] = "Plateforme";
-$lang["software"][4] = "Lieu";
-$lang["software"][5] = "Version";
-$lang["software"][6] = "Commentaires";
-$lang["software"][7] = "rechercher logiciel";
-$lang["software"][8] = "ou";
-$lang["software"][9] = "contient";
-$lang["software"][10] = "Logiciel";
-$lang["software"][11] = "Licences";
-$lang["software"][12] = "Ajouter licence...";
-$lang["software"][13] = "licence(s) trouvée(s)";
-$lang["software"][14] = "Pas de licence pour ce logiciel.";
-$lang["software"][15] = "Ajouter des licences pour un logiciel";
-$lang["software"][16] = "Numéros de série <br>'free' -> logiciels libres<br>'global' -> licences site";
-$lang["software"][17] = "logiciel installé";
-$lang["software"][18] = "Licence deja installée.";
-$lang["software"][19] = "Installations";
-$lang["software"][20] = "Restant";
-$lang["software"][21] = "Total";
-$lang["software"][22] = "Pas de logiciel trouvé.";
-$lang["software"][23] = "Logiciels";
-$lang["software"][24] = "Date fin";
-$lang["software"][25] = "Expire le";
-$lang["software"][26] = "N'expire jamais";
-$lang["software"][27] = "Licence expirée";
-$lang["software"][28] = "OEM";
-$lang["software"][29] = "Mise à jour";
-$lang["software"][30] = "depuis";
-$lang["software"][31] = "Numéros de série";
-$lang["software"][32] = "Expiration";
-$lang["software"][33] = "OEM";
-$lang["software"][34] = "Modifier une licence";
-$lang["software"][35] = "Acheté";
-$lang["software"][36] = "mise(s) à jour trouvée(s)";
-$lang["software"][37] = "A acheter";
-$lang["software"][38] = "Licence site";
-$lang["software"][39] = "Logiciel libre";
-$lang["software"][40] = "Aucune licence";
-
-
-// Peripherals
-$lang["peripherals"][0] = "Ajouter périphérique...";
-$lang["peripherals"][3] = "Ajouter périphérique";
-$lang["peripherals"][4] = "Périphérique";
-$lang["peripherals"][5] = "Nom";
-$lang["peripherals"][6] = "Lieu";
-$lang["peripherals"][7] = "Contact numéro";
-$lang["peripherals"][8] = "Contact";
-$lang["peripherals"][9] = "Type";
-$lang["peripherals"][10] = "Numéro de série";
-$lang["peripherals"][11] = "Numéro d'inventaire";
-$lang["peripherals"][12] = "Commentaire";
-$lang["peripherals"][13] = "Lieu";
-$lang["peripherals"][14] = "";
-$lang["peripherals"][15] = "";
-$lang["peripherals"][16] = "Dernière modification";
-$lang["peripherals"][17] = "Pas de peripherique trouvé.";
-$lang["peripherals"][18] = "Marque";
-$lang["peripherals"][19] = "";
-$lang["peripherals"][20] = "";
-$lang["peripherals"][21] = "Taille";
-$lang["peripherals"][22] = "Connecté a";
-$lang["peripherals"][23] = "ID";
-$lang["peripherals"][24] = "Date d'achat ";
-$lang["peripherals"][25] = "Expiration garantie";
-$lang["peripherals"][26] = "Maintenance";
-$lang["peripherals"][27] = "identifiant";
-$lang["peripherals"][28] = "Périphériques";
-$lang["peripherals"][29] = "Responsable technique";
-
-// Reports
-$lang["reports"][0] = "Sélectionner un rapport à générer";
-$lang["reports"][1] = "Imprimantes sous contrat de maintenance";
-$lang["reports"][2] = "Moniteurs sous contrat de maintenance";
-$lang["reports"][3] = "Materiel réseau sous contrat de maintenance";
-$lang["reports"][4] = "Liste du materiel sous contrat de maintenance";
-$lang["reports"][5] = "Ordinateurs sous contrat de maintenance";
-$lang["reports"][6] = "Ordinateurs";
-$lang["reports"][7] ="Imprimantes";
-$lang["reports"][8] ="Materiel réseau";
-$lang["reports"][9] ="Moniteurs";
-$lang["reports"][10] ="Sélectionnez un type de matériel";
-$lang["reports"][11] ="Materiel sous contrat de maintenance";
-$lang["reports"][12] ="Type(s) de matériel";
-$lang["reports"][13] ="Date(s) d'achat";
-$lang["reports"][14] ="Option de tri";
-$lang["reports"][15] ="Afficher rapport";
-$lang["reports"][16] ="Tous";
-$lang["reports"][17] ="Date achat";
-$lang["reports"][18] ="N° serie";
-$lang["reports"][19] ="Nom contact";
-$lang["reports"][20] ="Lieu";
-$lang["reports"][21] ="Date fin garantie";
-$lang["reports"][22] ="Type de date";
-$lang["reports"][23] ="Date(s)";
-$lang["reports"][24] ="Restreindre aux ordinateurs";
-$lang["reports"][25] ="Rapport interventions";
-$lang["reports"][26] ="Rapport par défaut";
-$lang["reports"][27] ="Maintenance";
-$lang["reports"][28] ="Par année";
-$lang["reports"][29] ="Périphériques";
-$lang["reports"][30] = "Périphériques sous contrat de maintenance";
-$lang["reports"][31] ="complet";
-$lang["reports"][32] ="limité";
-$lang["reports"][33] ="Rapport réseau";
-$lang["reports"][34] ="numéro de l'étage";
-$lang["reports"][35] ="Bureau";
-$lang["reports"][36] ="Periphériques connectés";
-$lang["reports"][37] ="Prises";
-$lang["reports"][38] ="IP";
-$lang["reports"][39] ="étage";
-$lang["reports"][40] ="bureau";
-$lang["reports"][41] ="switch";
-$lang["reports"][42] ="nom du switch";
-$lang["reports"][43] ="numéro du bureau";
-$lang["reports"][44] ="numéro de la prise";
-$lang["reports"][45] ="carte";
-$lang["reports"][46] ="port du switch";
-$lang["reports"][47] ="port du périphérique";
-
-// LDAP
-$lang["ldap"][0] = "recherche";
-$lang["ldap"][1] = "Montrer";
-$lang["ldap"][2] = "et";
-$lang["ldap"][3] = "ou l'attribut";
-$lang["ldap"][4] = "Ajouter nouvelle entrée...";
-$lang["ldap"][5] = "requis";
-$lang["ldap"][6] = "permis";
-$lang["ldap"][7] = "LDAP";
-
-
-// Setup
-$lang["setup"][0] = "Intitulés";
-$lang["setup"][1] = "Modèles";
-$lang["setup"][2] = "Ajouter un utilisateur GLPI";
-$lang["setup"][3] = "Lieu";
-$lang["setup"][4] = "Type de machines";
-$lang["setup"][5] = "Système d'exploitation";
-$lang["setup"][6] = " Type RAM";
-$lang["setup"][7] = "Microprocesseur";
-$lang["setup"][8] = "Carte réseau";
-$lang["setup"][9] = "Interface réseau";
-$lang["setup"][10] = "Inventaire";
-$lang["setup"][11] = "changer le mot de passe pour";
-$lang["setup"][12] = "Utilisateur";
-$lang["setup"][13] = "Nom réel";
-$lang["setup"][14] = "E-Mail";
-$lang["setup"][15] = "Numéro de telephone";
-$lang["setup"][16] = "Lieux";
-$lang["setup"][17] = "Type de compte";
-$lang["setup"][18] = "Login";
-$lang["setup"][19] = "Password";
-$lang["setup"][20] = "Type";
-$lang["setup"][21] = "N'oubliez pas de mettre un mot de passe plus tard !";
-$lang["setup"][22] = "Ajouter un modèle";
-$lang["setup"][23] = "Nom du modèle";
-$lang["setup"][24] = "Nom";
-$lang["setup"][25] = "Lieux";
-$lang["setup"][26] = "Contact numéro";
-$lang["setup"][27] = "Contact Personne";
-$lang["setup"][28] = "Numéro de série";
-$lang["setup"][29] = "Numéro d'inventaire";
-$lang["setup"][30] = "Commentaire";
-$lang["setup"][31] = "Type";
-$lang["setup"][32] = "OS";
-$lang["setup"][33] = "OS Version";
-$lang["setup"][34] = "CPU";
-$lang["setup"][35] = "MHZ";
-$lang["setup"][36] = "RAM Type";
-$lang["setup"][37] = "RAM (MB)";
-$lang["setup"][38] = "HD (GB)";
-$lang["setup"][39] = "Carte réseau";
-$lang["setup"][40] = "Montrer les nouvelles interventions d'abord ?";
-$lang["setup"][41] = "Sélectionnez une Langue";
-$lang["setup"][42] = "Types de réseau";
-$lang["setup"][43] = "Types d'imprimantes";
-$lang["setup"][44] = "Types de moniteurs";
-$lang["setup"][45] = "Cartes mères";
-$lang["setup"][46] = "Cartes graphiques";
-$lang["setup"][47] = "Cartes son";
-$lang["setup"][48] = "Types de disque dur";
-$lang["setup"][49] = "Carte mère";
-$lang["setup"][50] = "Carte Graphique";
-$lang["setup"][51] = "Carte son";
-$lang["setup"][52] = "Type de disque dur";
-$lang["setup"][53] = "Date d'achat ";
-$lang["setup"][54] = "Expiration garantie";
-$lang["setup"][55] = "Maintenance";
-$lang["setup"][56] = "Configuration";
-$lang["setup"][57] = "Utilisateur";
-$lang["setup"][58] = "Droit d'attribution d'intervention";
-$lang["setup"][59] = "Configurer les droits d'attribution d'intervention";
-$lang["setup"][60] = "Non";
-$lang["setup"][61] = "Oui";
-$lang["setup"][62] = "Sélectionnez la catégorie à configurer";
-$lang["setup"][63] = "Attention vous êtes sur le point de supprimer un intitulé utilisé pour un ou plusieurs éléments.";
-$lang["setup"][64] = " Si vous confirmez la suppression, les éléments utilisant cet intitulé se verront attribuer un champs NULL";
-$lang["setup"][65] = "Vous pouvez aussi remplacer toutes les occurences de cet intitulé par un autre :";
-$lang["setup"][66] = "Pas d'utilisateur trouvé";
-$lang["setup"][67] = "Authentifications externes";
-$lang["setup"][68] = "Suivis par emails";
-$lang["setup"][69] = "Types de périphériques";
-$lang["setup"][70] = "Configuration générale";
-$lang["setup"][71] = "Firmware";
-$lang["setup"][72] = "Sélectionnez un intitulé";
-$lang["setup"][73] = "Prise réseau";
-$lang["setup"][74] = "Vous ne pouvez pas supprimer cet élément car il possède des sous-éléments";
-$lang["setup"][75] = "Comme fils de";
-$lang["setup"][76] = "Au même niveau que";
-$lang["setup"][77] = "Comme père de";
-$lang["setup"][78] = "Base de connaissances";
-$lang["setup"][79] = "Catégorie des suivis";
-$lang["setup"][80] = "Type de Tiers";
-
-$lang["setup"][100]="Configuration générale";
-$lang["setup"][101]="Chemin d'installation";
-$lang["setup"][102]="Niveau de log";
-$lang["setup"][103]="1- Critique (erreur de login seulement)";
-$lang["setup"][104]="2- Sévère (Non utilisée) ";
-$lang["setup"][105]="3- Important (logins réussis) ";
-$lang["setup"][106]="4- Notices (Ajout, suppression, tracking)";
-$lang["setup"][107]="5- Complet (Tout) ";
-$lang["setup"][108]="Nombre d'événements de log à afficher";
-$lang["setup"][109]="Temps en jours de conservation des logs (0 pour infini)";
-$lang["setup"][110]=" Montrer les interventions au login";
-$lang["setup"][111]="Nombre d'éléments à afficher par page";
-$lang["setup"][112]="Nombre de caractères maximum pour chaque éléments de la liste";
-$lang["setup"][113]="Langue par défaut";
-$lang["setup"][114]="Couleurs des priorités";
-
-$lang["setup"][150]="Sources d'authentification externes";
-$lang["setup"][151]=" Si vous ne souhaitez pas utiliser LDAP comme source(s) de connexion laissez les champs vides";
-$lang["setup"][152]="LDAP configuration";
-$lang["setup"][153]="Hote LDAP ";
-$lang["setup"][154]="Basedn";
-$lang["setup"][155]="rootdn (pour les connexions non anonymes)";
-$lang["setup"][156]="Pass (pour les connexions non anonymes)";
-$lang["setup"][157]="L'extension LDAP de votre parser PHP n'est pas installé";
-$lang["setup"][158]="Impossible d'utiliser LDAP comme source de connexion externe";
-$lang["setup"][159]="Filtre de connexion";
-
-$lang["setup"][160]=" Si vous ne souhaitez pas utiliser IMAP/POP comme source(s) de connexion laissez les champs vides. Plus d'informations sur <a target=\"_blank\" href=\"http://www.php.net/manual/fr/function.imap-open.php\";>php.net</a>.";
-$lang["setup"][161]="";
-$lang["setup"][162]="IMAP/POP configuration";
-$lang["setup"][163]="Serveur IMAP/POP";
-$lang["setup"][164]="Nom domaine IMAP/POP <br>(email de type [EMAIL PROTECTED])";
-$lang["setup"][165]="Votre parser PHP a été compilé sans les fonctions de connexion IMAP";
-$lang["setup"][166]="Impossible d'utiliser IMAP/POP comme source de connexion externe";
-$lang["setup"][167]="Liaisons GLPI/LDAP";
-$lang["setup"][168]="Options de connexion";
-$lang["setup"][169]="Boîte Mail (optionnel)";
-$lang["setup"][170]="Chaîne de connexion obtenue";
-$lang["setup"][171]="Port (optionnel)";
-
-$lang["setup"][200]="Suivis par emails";
-$lang["setup"][201]="Configuration de la fonction";
-$lang["setup"][202]="Utiliser le suivi par mail";
-$lang["setup"][203]="Mail de l'administrateur";
-$lang["setup"][204]="Signature des messages";
-$lang["setup"][205]="Options de configuration";
-$lang["setup"][206]="Envois à l'administrateur";
-$lang["setup"][207]="Envois à tous les utilisateurs de type 'admin'";
-$lang["setup"][208]="Envois à tous les utilisateurs de type 'normal'";
-$lang["setup"][209]="Envois au responsable de la tâche";
-$lang["setup"][210]="Envois au demandeur";
-$lang["setup"][211]="A chaque nouvelle intervention";
-$lang["setup"][212]="Pour chaque nouveau suivi";
-$lang["setup"][213]="A la fermeture d'une intervention";
-$lang["setup"][214]="A la création de ces demandes d'interventions";
-$lang["setup"][215]="Pour chaque nouveau suivi le concernant";
-$lang["setup"][216]="A la fermeture d'une intervention le concernant";
-$lang["setup"][217]="La fonction mail n'existe pas ou est désactivée sur votre système";
-$lang["setup"][218]="Impossible de configurer les envois de suivis par mails";
-$lang["setup"][219]="Voulez vous permettre les soumissions d'intervention anonymes (helpdesk.html)";
-$lang["setup"][220]="Impossible de modifier l'utilisateur 'Helpdesk'";
-
-
-// Helpdesk
-
-$lang["help"][0] = "Bienvenue";
-$lang["help"][1] = "Veuillez décrire votre problème";
-$lang["help"][2] = "Le problème doit être résolu";
-$lang["help"][3] = "Hier";
-$lang["help"][4] = "Tres vite";
-$lang["help"][5] = "Dans la journée";
-$lang["help"][6] = "La semaine prochaine";
-$lang["help"][7] = "Si vous avez le temps";
-$lang["help"][8] = "Informez-moi des suites données";
-$lang["help"][9] = "Non";
-$lang["help"][10] = "Oui";
-$lang["help"][11] = "Mon adresse de messagerie";
-$lang["help"][12] = "Le Numéro du matériel :";
-$lang["help"][13] = "Le problème";
-$lang["help"][14] = "Envoyer message";
-$lang["help"][15] = "Pas de description, réessayez.";
-$lang["help"][16] = "Vous voulez être informées des suites données mais vous n'avez pas entré d'adresse de messagerie !";
-$lang["help"][17] = "Veuillez saisir votre numéro de matériel.";
-$lang["help"][18] = "Votre signalement a été envoyé, le traitement est en cours.";
-$lang["help"][19] = "Merci d'avoir utilisé notre systeme d'aide automatique.";
-$lang["help"][20] = "Votre problème ne peut pas être ajouté dans notre base de données.";
-$lang["help"][21] = "Veuillez prendre contact avec un technicien. SVP";
-$lang["help"][22] = "Rechercher votre numéro du matériel";
-$lang["help"][23] = "Saisissez les premières lettres (nom, matériel ou n° de série)";
-$lang["help"][24] = "Type d'intervention";
-$lang["help"][25] = "Ordinateur";
-$lang["help"][26] = "Matériel réseau";
-$lang["help"][27] = "Imprimante";
-$lang["help"][28] = "Moniteur";
-$lang["help"][29] = "Périphérique";
-$lang["help"][30] = "Général";
-$lang["help"][31] = "Logiciel";
-
- // Mois
- $lang["calendarM"][0] = "Janvier" ;
- $lang["calendarM"][1] = "Février" ;
- $lang["calendarM"][2] = "Mars" ;
- $lang["calendarM"][3] = "Avril" ;
- $lang["calendarM"][4] = "Mai" ;
- $lang["calendarM"][5] = "Juin" ;
- $lang["calendarM"][6] = "Juillet" ;
- $lang["calendarM"][7] = "Août" ;
- $lang["calendarM"][8] = "Septembre" ;
- $lang["calendarM"][9] = "Octobre" ;
- $lang["calendarM"][10] = "Novembre" ;
- $lang["calendarM"][11] = "Décembre" ;
-
- // Première lettre des jours de la semaine
- $lang["calendarD"][0] = "D" ;
- $lang["calendarD"][1] = "L" ;
- $lang["calendarD"][2] = "M" ;
- $lang["calendarD"][3] = "M" ;
- $lang["calendarD"][4] = "J" ;
- $lang["calendarD"][5] = "V" ;
- $lang["calendarD"][6] = "S" ;
-
- // Mail ne pas mettre au format html !!!!
-
-$lang["mailing"][0]="-----------------------";
-$lang["mailing"][1]="=======================================";
-$lang["mailing"][2]="Auteur : ";
-$lang["mailing"][3]="Contenu : ";
-$lang["mailing"][4]="Intervention(s) déjà effectuée(s)";
-$lang["mailing"][5]="Description de l'intervention";
-$lang["mailing"][6]="Date de début : ";
-$lang["mailing"][7]="Ordinateur concerné : ";
-$lang["mailing"][8]="Attribué à : ";
-$lang["mailing"][9]="Nouvelle demande d'intervention";
-$lang["mailing"][10]="Nouveau suivi d'intervention";
-$lang["mailing"][11]="Intervention terminée le ";
-$lang["mailing"][12]="Attribution de l'intervention";
-$lang["mailing"][13]="Erreur dans la génération de l'email automatique";
-$lang["mailing"][14]="Changement de catégorie de l'intervention";
-$lang["mailing"][15]="Changement de priorité de l'intervention";
-
-
-//Les stats
-$lang["stats"][0] = "Sélectionnez les statistiques à visualiser";
-$lang["stats"][1] = "Globales";
-$lang["stats"][2] = "Par technicien";
-$lang["stats"][3] = "Par Intitulés";
-$lang["stats"][4] = "Par utilisateur";
-$lang["stats"][5] = "Nombre total d'interventions";
-$lang["stats"][6] = "Délai moyen de résolution de panne";
-$lang["stats"][7] = "Délai maximal de résolution de panne";
-$lang["stats"][8] = "Ce mois ci";
-$lang["stats"][9] = "Cette année";
-$lang["stats"][10] = "Au total";
-$lang["stats"][11] = "Nombre d'interventions résolues";
-$lang["stats"][12] = "Statistiques Globales";
-$lang["stats"][13] = "Nombre d'interventions attribuées";
-$lang["stats"][14] = "Nombre d'interventions résolues";
-$lang["stats"][15] = "durée moyenne d'ouverture";
-$lang["stats"][16] = "Nom du technicien";
-$lang["stats"][17] = "Statistiques techniciens";
-$lang["stats"][18] = "Statistiques utilisateurs";
-$lang["stats"][19] = "Statistiques";
-$lang["stats"][20] = "Nom d'utilisateur";
-$lang["stats"][21] = "Lieu";
-$lang["stats"][22] = "Nombre d'interventions demandées";
-$lang["stats"][23] = "Pas de statistiques disponibles";
-$lang["stats"][25] = "Durée réelle moyenne de l'intervention";
-$lang["stats"][26] = "Types";
-$lang["stats"][27] = "Durée réelle totale des interventions";
-$lang["stats"][28] = "Durée maximale de résolution réelle de panne";
-$lang["stats"][29] = "Délai minimum de prise en compte de l'intervention";
-$lang["stats"][30] = "Délai moyen de prise en compte de l'intervention";
-$lang["stats"][31] = "Jour(s)";
-$lang["stats"][32] = "Heure(s)";
-$lang["stats"][33] = "Min(s)";
-$lang["stats"][34] = "Sec(s)";
-$lang["stats"][35] = "Intervention(s)";
-// install update
-
-$lang["install"][0] = "Installation ou mise à jour de GLPI";
-$lang["install"][1] = " Choissisez \"Installation\" pour une nouvelle installation complète de GLPI ( les données importées par GLPI seront les données par défaut).";
-$lang["install"][2] = "Choisissez \" Mise à jour\" pour mettre à jour GLPI à partir d'une version antérieure";
-$lang["install"][3] = "Installation";
-$lang["install"][4] = "Mise à jour";
-$lang["install"][5] = "Vérification de la compatibilité de votre environnement avec l'execution de GLPI";
-$lang["install"][6] = "Test effectué";
-$lang["install"][7] = "Résultats";
-$lang["install"][8] = "Test du Parser PHP";
-$lang["install"][9] = "Vous devez installer PHP4 Vous pouvez le télécharger ici :";
-$lang["install"][10] = "Vous utilisez une des versions 4.0.0 ou 4.0.1 de PHP - Nous vous conseillons de mettre à jour votre PHP";
-$lang["install"][11] = "La version de PHP est 4.x - Parfait !";
-$lang["install"][12] = "Test des Sessions";
-$lang["install"][13] = "Votre parser PHP n'as pas été compilé avec le support des sessions ! ";
-$lang["install"][14] = "Le support des sessions est opérationnel - Parfait !";
-$lang["install"][15] = "Vérifiez que le support des sessions est bien activé dans votre php.ini";
-$lang["install"][16] = "Tests d'écriture de fichiers dump";
-$lang["install"][17] = "Le fichier n'a pas pu être créé.";
-$lang["install"][18] = "Vérifiez que PHP a un droit d'écriture pour le répertoire : 'backups/dump/'. Si vous êtes sous un environnement de Microsoft Windows, regardez si c'est en lecture seule.";
-$lang["install"][19] = "Le fichier a été créé mais n'a pas pu être supprimé.";
-$lang["install"][20] = "Le fichier a été créé et supprimé - Parfait !";
-$lang["install"][21] = "Test d'écriture de fichiers temporaires";
-$lang["install"][22] = "Vérifiez que PHP a un droit d'écriture pour le répertoire : 'reports/reports/convexcel/tmp/'. Si vous êtes sous un environnement de Microsoft Windows, regardez si c'est en lecture seule.";
-$lang["install"][23] = "Test d'écriture de fichier configuration";
-$lang["install"][24] = "Vérifiez que PHP a un droit d'écriture pour le répertoire : 'glpi/config/'. Si vous êtes sous un environnement de Microsoft Windows, regardez si c'est en lecture seule.";
-$lang["install"][25] = "Continuer ?";
-$lang["install"][26] = "Continuer";
-$lang["install"][27] = "Réessayer";
-$lang["install"][28] = "Configuration de la connexion à la base de données";
-$lang["install"][29] = "Paramètres de connexion à la base de données";
-$lang["install"][30] = "Mysql server";
-$lang["install"][31] = "Mysql user";
-$lang["install"][32] = "Mysql pass";
-$lang["install"][33] = "Retour";
-$lang["install"][34] = "Test de la connexion à la base de données";
-$lang["install"][35] = "Impossible de se connecter à la base de données";
-$lang["install"][36] = " Le serveur a répondu";
-$lang["install"][37] = "Le champs serveur ou/et le champ user est vide";
-$lang["install"][38] = "Veuillez selectionner une base de données : ";
-$lang["install"][39] = "Créer une nouvelle base :";
-$lang["install"][40] = "Veuillez selectionner la base de données à mettre à jour : ";
-$lang["install"][41] = "Impossible d'utiliser la base : ";
-$lang["install"][42] = "";
-$lang["install"][43] = "OK - La base a bien été initialisée";
-$lang["install"][44] = "Des valeurs par défaut ont été entrées, n'hésitez pas à supprimer ces dernières";
-$lang["install"][45] = "Ne supprimez pas l'utilisateur 'helpdesk' ";
-$lang["install"][46] = "A la première connexion vous pouvez utiliser le login \"glpi\" et le mot de passe \"glpi\" pour accéder à l'application avec des droits administrateur";
-$lang["install"][47] = "Impossible d'écrire le fichier de configuration de votre base de données";
-$lang["install"][48] = "Erreur lors de la création de la base !";
-$lang["install"][49] = "Vous n'avez pas sélectionné de base de données !";
-$lang["install"][50] = "";
-$lang["install"][51] = "Configuration de GLPI :";
-$lang["install"][52] = "Les valeurs présélectionnées sont les valeurs par defaut, il est recommandé de laisser ces valeurs";
-$lang["install"][53] = "Votre configuration a bien été enregistrée";
-$lang["install"][54] = "Cliquez sur 'Continue' pour terminer l'installation";
-$lang["install"][55] = "L'installation est terminée";
-$lang["install"][56] = "Il est recommandé maintenant d'appliquer un chmod+0 sur les fichiers install.php et update.php";
-$lang["install"][57] = "Les logins mots de passes par defauts sont :";
-$lang["install"][58] = "glpi/glpi pour le compte administrateur";
-$lang["install"][59] = "tech/tech pour le compte technicien";
-$lang["install"][60] = "normal pour le compte normal";
-$lang["install"][61] = "post-only/post-only pour le compte postonly";
-$lang["install"][62] = "Vous pouvez supprimer ou modifier ces comptes ainsi que les premières entrées dans la base de données.";
-$lang["install"][63] = "Attention tout de même NE SUPPRIMEZ PAS l'utilisateur HELPDESK.";
-$lang["install"][64] = "Utiliser GLPI";
-$lang["install"][65] = "Test sur l'extension magic_quotes_sybase";
-$lang["install"][66] = "GLPI ne peux pas fonctionner avec l'option magic_quotes_sybase ; Veuillez désactiver cette option et réessayer";
-$lang["install"][67] = "L'option magic_quotes_sybase n'est pas utilisée par votre serveur - Parfait !";
-$lang["install"][70] = "Impossible de créer le fichier de connexion à la base de données, vérifiez les droits sur les fichiers";
-$lang["install"][71] = "Test de l'extension mysql.";
-$lang["install"][72] = "Vous devez compiler votre php avec l'extension Mysql.";
-$lang["install"][73] = "Ok - la fonction mysql_connect() existe - Parfait !";
-
-$lang["update"][90] ="Erreur durant la mise à jour de la base de données";
-$lang["update"][91] ="Attention ! ";
-$lang["update"][92] ="Vous allez mettre à jour votre base de données GLPI ayant pour nom :";
-$lang["update"][93] ="Connexion à la base de données réussie";
-$lang["update"][94] ="La mise à jour est réussie, votre base de données est actualisée";
-$lang["update"][95] ="La connexion à la base de données a échouée, verifiez les paramètres de connexion figurant dans le fichier config_db.php";
-$lang["update"][96] = "Tous vos utilisateurs ayant précedement les droits \"admin\" se sont vu attribuer les droits \"super-admin\" avec l'ajout de ce nouveau type d'utilisateur";
-$lang["update"][97] = "La base de données que vous venez de mettre à jour ne contient aucun utilisateur \"super-admin\"";
-$lang["update"][98] = "Vous devez en créer un absolument afin de pouvoir re-configurer l'application (notamment les accès aux sources de données externes)";
-$lang["update"][99] = "Vous pourrez supprimer cet utilisateur une fois que vous aurez configuré l'application";
-$lang["update"][100] = "Entrez le login";
-$lang["update"][101] = "Entrez le mot de passe";
-$lang["update"][102] = "Re-entrez le mot de passe";
-$lang["update"][103] = "Le Login ou le mot de passe sont vides, ou vous avez saisi deux mots de passes différents";
-$lang["update"][104] = "Utilisateur bien enregistré vous pouvez vous connecter à l'application";
-$lang["update"][105] = "Impossible d'accéder à la mise à jour de cette façon !!";
-$lang["update"][106] = "Retourner à GLPI";
-$lang["update"][107] = "Vous devez maintenant procéder à la mise à jour de l'ancien contenu de votre base de données";
-$lang["update"][108] = "La mise à jour du contenu ne semble pas nécessaire.";
-$lang["update"][109] = "Voulez vous tout de même la faire ?";
-$lang["update"][110] = "La mise à jour semble nécessaire.";
-
-
-$lang["reservation"][0] = "Réservations";
-$lang["reservation"][1] = "Matériel réservable";
-$lang["reservation"][2] = "ID";
-$lang["reservation"][3] = "Type matériel";
-$lang["reservation"][4] = "Matériel en prêt";
-$lang["reservation"][5] = "En prêt";
-$lang["reservation"][6] = "Ne pas autoriser le prêt";
-$lang["reservation"][7] = "Autoriser le prêt";
-$lang["reservation"][8] = "Réserver";
-$lang["reservation"][9] = "Réserver un matériel";
-$lang["reservation"][10] = "Date Début";
-$lang["reservation"][11] = "Date Fin";
-$lang["reservation"][12] = "Heure Début";
-$lang["reservation"][13] = "Heure Fin";
-$lang["reservation"][14] = "Supprimer réservation";
-$lang["reservation"][15] = "Journée";
-$lang["reservation"][16] = "Jusqu'à";
-$lang["reservation"][17] = "Dès";
-$lang["reservation"][18] = "Le matériel demandé est déjà réservé pour cette plage.";
-$lang["reservation"][19] = "Erreur dans l'entrée de vos dates. La date de début est surement supérieure à la date de fin";
-$lang["reservation"][20] = "Retour au calendrier";
-$lang["reservation"][21] = "Voir les réservations";
-$lang["reservation"][22] = "Modifier le commentaire";
-$lang["reservation"][23] = "Commentaire";
-$lang["reservation"][24] = "Prêt";
-$lang["reservation"][25] = "Tous les matériels en prêt";
-$lang["reservation"][26] = "Voir tous";
-$lang["reservation"][27] = "Périodicité";
-$lang["reservation"][28] = "Par semaine";
-$lang["reservation"][29] = "Par jour";
-$lang["reservation"][30] = "fois";
-$lang["reservation"][31] = "Par";
-$lang["reservation"][32] = "Editer réservation";
-
-$lang["knowbase"][0] ="Base de connaissances";
-$lang["knowbase"][1] ="FAQ";
-$lang["knowbase"][2] ="Ajouter un item à la base de connaissances";
-$lang["knowbase"][3] ="Question";
-$lang["knowbase"][4] ="Réponse";
-$lang["knowbase"][5] ="Placer cet item dans la FAQ publique";
-$lang["knowbase"][6] ="Sélectionner une catégorie pour cet item : ";
-$lang["knowbase"][7] ="Retirer cet item de la FAQ publique";
-$lang["knowbase"][8] ="Modifier cet item ";
-$lang["knowbase"][9] ="Supprimer cet item ";
-$lang["knowbase"][10] ="Cet item fait partie de la FAQ publique ";
-$lang["knowbase"][11] ="Cet item ne fait pas partie de la FAQ publique ";
-$lang["knowbase"][12] ="Racine ";
-$lang["knowbase"][13] ="Nom de la catégorie ";
-$lang["knowbase"][14] ="Sous catégorie de ... ";
-$lang["knowbase"][15] ="Ajouter une nouvelle catégorie ";
-$lang["knowbase"][16] ="Ajout de la nouvelle catégorie ";
-$lang["knowbase"][17] ="Modification de la catégorie ";
-$lang["knowbase"][18] ="Supression de la catégorie ";
-$lang["knowbase"][19] ="Echec de la suppression : Cette catégorie contient des items, vous devez effacer tous les items de cette catégorie avant de la supprimer ";
-$lang["knowbase"][20] ="Base de connaissances vide";
-$lang["knowbase"][21] ="Tout déplier";
-$lang["knowbase"][22] ="Tout replier";
-
-$lang["title"][0] = "Centre de contrôle";
-$lang["title"][1] = "Accès au Helpdesk seulement";
-$lang["title"][2] = "Configuration";
-$lang["title"][3] = "Ordinateurs";
-$lang["title"][4] = "Helpdesk";
-$lang["title"][5] = "Base de connaissances";
-$lang["title"][6] = "Matériel Réseau";
-$lang["title"][7] = "Périphériques";
-$lang["title"][8] = "Imprimantes";
-$lang["title"][9] = "Réservation";
-$lang["title"][10] = "Suivi d'intervention";
-$lang["title"][11] = "Statistiques";
-$lang["title"][12] = "Logiciels";
-$lang["title"][13] = "Informations Utilisateur";
-$lang["title"][14] = "Sources d'authentification externes";
-$lang["title"][15] = "Mailing";
-$lang["title"][16] = "Rapports";
-$lang["title"][17] = "Préférences";
-$lang["title"][18] = "Ecrans";
-$lang["title"][19] = "Cartouches";
-$lang["title"][20] = "Contrats";
-$lang["title"][21] = "Infos Commerciales";
-$lang["title"][22] = "Contacts";
-$lang["title"][23] = "Entreprises";
-$lang["title"][24] = "Assistance";
-
-$lang["device_hdd"][0] = "Rpm";
-$lang["device_hdd"][1] = "Cache";
-$lang["device_hdd"][2] = "Interface";
-$lang["device_hdd"][3] = "";
-$lang["device_hdd"][4] = "Capacité";
-$lang["device_hdd"][5] = "Commentaire";
-
-
-$lang["device_iface"][0] = "Debit";
-$lang["device_iface"][1] = "Commentaire";
-$lang["device_iface"][2] = "Adresse Mac";
-
-
-$lang["device_gfxcard"][0] = "memoire";
-$lang["device_gfxcard"][1] = "Commentaire";
-$lang["device_gfxcard"][2] = "interface";
-
-
-$lang["device_moboard"][0] = "Chipset";
-$lang["device_moboard"][1] = "Commentaire";
-
-
-$lang["device_processor"][0] = "Frequence";
-$lang["device_processor"][1] = "";
-$lang["device_processor"][2] = "";
-$lang["device_processor"][3] = "Commentaire";
-
-
-$lang["device_ram"][0] = "Type";
-$lang["device_ram"][1] = "Frequence";
-$lang["device_ram"][2] = "Commentaire";
-
-
-$lang["device_sndcard"][0] = "Type";
-$lang["device_sndcard"][1] = "Commentaire";
-$lang["device_sndcard"][2] = "";
-
-$lang["devices"][0] = "Ajouter un nouveau periphérique interne";
-$lang["devices"][1] = "Disque dur";
-$lang["devices"][2] = "Carte graphique";
-$lang["devices"][3] = "Interface reseau";
-$lang["devices"][4] = "Processeur";
-$lang["devices"][5] = "Carte mère";
-$lang["devices"][6] = "Memoire vive";
-$lang["devices"][7] = "Carte son";
-$lang["devices"][8] = "Désignation";
-$lang["devices"][9] = "Ajout d'un nouveau periphérique interne pour l'ordinateur: ";
-$lang["devices"][10] = "Périphériques Internes ";
-
-$lang["cartridges"][0] = "Cartouche";
-$lang["cartridges"][1] = "Nom";
-$lang["cartridges"][2] = "Référence";
-$lang["cartridges"][3] = "Type";
-$lang["cartridges"][4] = "ID";
-$lang["cartridges"][5] = "Commentaire";
-$lang["cartridges"][6] = "Ajouter Type de Cartouche...";
-$lang["cartridges"][7] = "Pas de cartouche trouvée";
-$lang["cartridges"][8] = "Fabriquant";
-$lang["cartridges"][9] = "Aucune cartouche";
-$lang["cartridges"][10] = "Toner";
-$lang["cartridges"][11] = "Jet-Encre";
-$lang["cartridges"][12] = "Type de Cartouche";
-$lang["cartridges"][13] = "Neuve(s)";
-$lang["cartridges"][14] = "Utilisée(s)";
-$lang["cartridges"][15] = "Vieille(s)";
-$lang["cartridges"][16] = "Cartouche(s)";
-$lang["cartridges"][17] = "Ajouter cartouche...";
-$lang["cartridges"][18] = "Ajouter Cartouche";
-$lang["cartridges"][19] = "Modifier Cartouche";
-$lang["cartridges"][20] = "Neuve";
-$lang["cartridges"][21] = "Utilisée";
-$lang["cartridges"][22] = "Vieille";
-$lang["cartridges"][23] = "Etat";
-$lang["cartridges"][24] = "Date ajout";
-$lang["cartridges"][25] = "Date utilisation";
-$lang["cartridges"][26] = "Date Fin";
-$lang["cartridges"][27] = "Sur";
-$lang["cartridges"][28] = "Installer";
-$lang["cartridges"][29] = "Fin de vie";
-$lang["cartridges"][30] = "Total";
-$lang["cartridges"][31] = "Supprimer";
-$lang["cartridges"][32] = "Type d'imprimantes compatibles";
-$lang["cartridges"][33] = "Cartouches utilisées";
-$lang["cartridges"][34] = "Pas de cartouche libre";
-$lang["cartridges"][35] = "Vieilles Cartouches";
-$lang["cartridges"][36] = "Lieu Stockage";
-
-$lang["financial"][0] = "Ajouter Contrat...";
-$lang["financial"][1] = "Contrat";
-$lang["financial"][2] = "Ajouter Infos Commerciales...";
-$lang["financial"][3] = "Informations Commerciales";
-$lang["financial"][4] = "Numéro";
-$lang["financial"][5] = "Coût";
-$lang["financial"][6] = "Type de contrat";
-$lang["financial"][7] = "Date début";
-$lang["financial"][8] = "Durée";
-$lang["financial"][9] = "an(s)";
-$lang["financial"][10] = "Préavis";
-$lang["financial"][11] = "Type de Facturation";
-$lang["financial"][12] = "Commentaires";
-$lang["financial"][13] = "Numéro comptable";
-$lang["financial"][14] = "Date d'achat";
-$lang["financial"][15] = "Durée garantie";
-$lang["financial"][16] = "Informations garantie";
-$lang["financial"][17] = "Tiers";
-$lang["financial"][18] = "Numéro de commande";
-$lang["financial"][19] = "Bon de livraison";
-$lang["financial"][20] = "Numéro d'immobilisation";
-$lang["financial"][21] = "Valeur";
-$lang["financial"][22] = "Type d'amortissement";
-$lang["financial"][23] = "Durée d'amortissement";
-$lang["financial"][24] = "Ajouter Contact...";
-$lang["financial"][25] = "Ajouter Entreprise...";
-$lang["financial"][26] = "Entreprise";
-$lang["financial"][27] = "Nom";
-$lang["financial"][28] = "ID";
-$lang["financial"][29] = "Téléphone";
-$lang["financial"][30] = "Fax";
-$lang["financial"][31] = "Email";
-$lang["financial"][32] = "Contact";
-$lang["financial"][33] = "Ajouter un Contact";
-$lang["financial"][34] = "Ajouter une Entreprise";
-$lang["financial"][35] = "Ajouter une Information Commerciale";
-$lang["financial"][36] = "Ajouter un Contrat";
-$lang["financial"][37] = "Type";
-$lang["financial"][38] = "Pas de contact trouvé";
-$lang["financial"][39] = "Pas d'entreprise trouvée";
-$lang["financial"][40] = "Pas de contrat trouvé";
-$lang["financial"][41] = "Pas d'Information Commerciale trouvée";
-$lang["financial"][42] = "Commercial";
-$lang["financial"][43] = "Technicien";
-$lang["financial"][44] = "Adresse";
-$lang["financial"][45] = "Site Web";
-$lang["financial"][46] = "Contacts associés";
-$lang["financial"][47] = "Linéaire";
-$lang["financial"][48] = "Dégressif";
-$lang["financial"][49] = "Eléments associés";
-$lang["financial"][50] = "Prêt";
-$lang["financial"][51] = "Location";
-$lang["financial"][52] = "Leasing";
-$lang["financial"][53] = "Assurances";
-$lang["financial"][54] = "Maintenace Hardware";
-$lang["financial"][55] = "Maintenance Software";
-$lang["financial"][56] = "Prestation";
-$lang["financial"][57] = "mois";
-$lang["financial"][58] = "Facturation";
-$lang["financial"][59] = "Heures d'intervention";
-$lang["financial"][60] = "en semaine";
-$lang["financial"][61] = "le samedi";
-$lang["financial"][62] = "dimanche et fêtes";
-$lang["financial"][63] = "Début";
-$lang["financial"][64] = "Fin";
-$lang["financial"][65] = "Entreprises associées";
-$lang["financial"][66] = "Contrats associés";
-$lang["financial"][67] = "Informations Commerciales associées";
-$lang["financial"][68] = "Activer les informations commerciales";
-$lang["financial"][69] = "Périodicté";
-$lang["financial"][70] = "Mensuel";
-$lang["financial"][71] = "Bimensuel";
-$lang["financial"][72] = "Trimestriel";
-$lang["financial"][73] = "Semestriel";
-$lang["financial"][74] = "Annuel";
-$lang["financial"][75] = "Bi-annuel";
-$lang["financial"][76] = "Date de mise en service";
-$lang["financial"][77] = "Coefficient d'amortissement";
-$lang["financial"][78] = "Valeur extension garantie";
-$lang["financial"][79] = "Type de Tiers";
-
-$lang["financial"][80] = "Expiration garantie";
-$lang["financial"][81] = "Valeur nette comptable";
-
-?>
\ Pas de fin de ligne à la fin du fichier.
diff -Nur web/glpi/glpi/glpi/dicts/italian.php glpi/glpi/dicts/italian.php
--- web/glpi/glpi/glpi/dicts/italian.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/dicts/italian.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,24 +1,30 @@
<?php
/*
-
----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
+
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License (GPL)
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ This file is part of GLPI.
- To read the license please visit http://www.gnu.org/copyleft/gpl.html
+ GLPI is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ GLPI is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ 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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/dicts/Pfrench.diff glpi/glpi/dicts/Pfrench.diff
--- web/glpi/glpi/glpi/dicts/Pfrench.diff 2005-03-04 11:15:11.000000000 +0100
+++ glpi/glpi/dicts/Pfrench.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
---- french.php 2005-03-04 09:19:53.000000000 +0100
-+++ frenchB.php 2005-03-04 10:00:28.000000000 +0100
-@@ -548,7 +548,21 @@
- $lang["reports"][30] = "Périphériques sous contrat de maintenance";
- $lang["reports"][31] ="complet";
- $lang["reports"][32] ="limité";
--
-+$lang["reports"][33] ="Rapport réseau";
-+$lang["reports"][34] ="numéro de l'étage";
-+$lang["reports"][35] ="Bureau";
-+$lang["reports"][36] ="Periphériques connectés";
-+$lang["reports"][37] ="Prises";
-+$lang["reports"][38] ="IP";
-+$lang["reports"][39] ="étage";
-+$lang["reports"][40] ="bureau";
-+$lang["reports"][41] ="switch";
-+$lang["reports"][42] ="nom du switch";
-+$lang["reports"][43] ="numéro du bureau";
-+$lang["reports"][44] ="numéro de la prise";
-+$lang["reports"][45] ="carte";
-+$lang["reports"][46] ="port du switch";
-+$lang["reports"][47] ="port du périphérique";
-
- // LDAP
- $lang["ldap"][0] = "recherche";
diff -Nur web/glpi/glpi/glpi/dicts/transrapi.css glpi/glpi/dicts/transrapi.css
--- web/glpi/glpi/glpi/dicts/transrapi.css 2004-09-11 19:40:05.000000000 +0200
+++ glpi/glpi/dicts/transrapi.css 1970-01-01 01:00:00.000000000 +0100
@@ -1,142 +0,0 @@
-/* TransRapi 0.3
-
- Interface web pour fichiers de langue au format PHP
-
- Copyright (C) 2004 Olivier Fraysse.
-
- This file is part of TransRapi.
-
- TransRapi is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- TransRapi is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with TransRapi; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- (http://www.gnu.org/licenses/gpl.txt)
-
- http://tr.fooye.net
- http://tr.fooye.net/source/
- Contact : [EMAIL PROTECTED]
-*/
-body{
- font-family: sans-serif
-}
-#menu {
- font-size:12px;
- float:left;
- width:130px;
- background-color:#ff8040;
- border:1px solid black;
- padding-left:4px;
- border-top:2px solid #ff8040;
- border-right:none;
-}
-#menu li{
- list-style-type: none;
- background-color:#fff0f0;
- padding-top:2px;
-}
-#menu a{
- text-decoration:none;
- padding-left:5px;
- display:block;
- width:125px;
- color:black;
-}
-
-#menu li:hover{
- background-color:#ff8040;
- border:1px solid black;
- border-left:none;
- border-right:none;
- padding-top:0px;
- padding-left:2px;
-}
-ul.rub {
- background-color:#fff0f0;
- border:2px solid #ff8040;
- border-right:none;
- border-left:none;
- padding-left:4px;
- margin-left:0;
- font-size:12px;
- width:20%;
- float:left;
- list-style-type: none;
-}
-a{
- text-decoration:none;
- color:black;
-}
-
-li.li0{
- background-color:#ffc0a0;
- height:60px;
- border:2px solid transparent;
- padding:3px;
-}
-li.li1{
- background-color:#ffefcf;
- height:60px;
- border:2px solid transparent;
- padding:3px;
-}
-li.titre{
- padding:5px;
-
- border:3px solid #ff8040;
- border-top:none;
- font-weight:bold;
-}
-.li1 input
-{
- background-color:#ffc0a0;
- width:90%;
- padding:0px;
- font-size:12px;
- border:none;
-}
-.li0 input
-{
- background-color:#ffefcf;
- width:90%;
- padding:0px;
- font-size:12px;
- border:none;
-}
-button
-{
- background-color:transparent;
- width:45%;
- font-size:12px;
- border:1px outset;
-}
-.hidden{
- display:none;
-}
-.langon{
- background-color:#ffefcf;
- font-weight:bold;
-}
-.langoff{
- background-color:#ffefff;
-
-}
-.mainlink{
- font-weight:bold;
-/* border-bottom:2px solid #ffefcf; */
-}
-.lino{
- background-color:#f0f040;
- height:60px;
- border:2px solid yellow;
- padding:3px;
-}
\ Pas de fin de ligne à la fin du fichier.
diff -Nur web/glpi/glpi/glpi/dicts/transrapi.js glpi/glpi/dicts/transrapi.js
--- web/glpi/glpi/glpi/dicts/transrapi.js 2004-08-29 20:09:14.000000000 +0200
+++ glpi/glpi/dicts/transrapi.js 1970-01-01 01:00:00.000000000 +0100
@@ -1,76 +0,0 @@
-// TransRapi 0.3
-//
-// Interface web pour fichiers de langue au format PHP
-//
-// Copyright (C) 2004 Olivier Fraysse.
-//
-// This file is part of TransRapi.
-//
-// TransRapi is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-
-// TransRapi is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with TransRapi; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//
-// (http://www.gnu.org/licenses/gpl.txt)
-//
-// http://tr.fooye.net
-// http://tr.fooye.net/source/
-// Contact : [EMAIL PROTECTED]
-//
-//******************************************************************
-
-function choice(choice,bool)
-{
- if(!bool)
- {
- document.getElementById(choice).style.display='block';
- document.getElementById('enable_'+choice).checked=true;
- document.getElementById('button_'+choice).setAttribute("class","langon");
- }
- else
- {
- document.getElementById('enable_'+choice).checked=false;
- document.getElementById(choice).style.display='none';
- document.getElementById('button_'+choice).setAttribute("class","langoff");
- }
-}
-function getCorrectForm(id,val)
-{
- elem = document.getElementById(id);
- elem.innerHTML ='<input type="hidden" id="hidden_'+id+'" value="'+ val +'" /><input id="input_'+id+'" value="'+ val +'" /><br /><button onclick="undoCorrectForm(\''+id+'\');">Annuler</button><button onclick="sendCorrectForm(\''+id+'\')">Valider</button>';
- /*elem.innerHTML ='<input type="hidden" id="hidden_'+id+'" value="'+ elem.innerHTML +'" /><input id="input_'+id+'" value="'+ elem.innerHTML +'" /><br /><button onclick="undoCorrectForm(\''+id+'\');">Annuler</button><button onclick="sendCorrectForm(\''+id+'\')">Valider</button>';
- */
- elem.onclick = false;
-
-}
-function undoCorrectForm(id)
-{
- elem = document.getElementById(id);
- val = document.getElementById("hidden_"+id).value;
- elem.innerHTML = val;
- elem.onclick=function(){getCorrectForm(id,val);};
-}
-function sendCorrectForm(id)
-{
-// elem = ;
- newscript = document.createElement('script');
- newscript.setAttribute("src", "?correct="+id+"&text="+document.getElementById("input_"+id).value);
- var aphead = document.getElementsByTagName('body').item(0);
- document.getElementById(id).style.border='2px dashed red';
-
- void(aphead.appendChild(newscript));
-}
-function changeRub(rub)
-{
- document.getElementById("lfrub").value=rub;
- document.getElementById("lform").submit();
-}
diff -Nur web/glpi/glpi/glpi/dicts/transrapi.php glpi/glpi/dicts/transrapi.php
--- web/glpi/glpi/glpi/dicts/transrapi.php 2004-09-11 19:40:05.000000000 +0200
+++ glpi/glpi/dicts/transrapi.php 1970-01-01 01:00:00.000000000 +0100
@@ -1,203 +0,0 @@
-<?php
-/* TransRapi 0.3
-
- Interface web pour fichiers de langue au format PHP
-
- Copyright (C) 2004 Olivier Fraysse.
-
- This file is part of TransRapi.
-
- TransRapi is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- TransRapi is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with TransRapi; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- (http://www.gnu.org/licenses/gpl.txt)
-
- http://tr.fooye.net
- http://tr.fooye.net/source/
- Contact : [EMAIL PROTECTED]
-
-Derniere modification : 14 Juillet 2004
-******************************************************************
-
-TODOLIST:
-garder les commentaires-en-lignes
-page d'accueil ?
-stylesheet pour impression (sans menu)
-*/
-
-$select="";
-$filenames = array ("english" => "english.php", "francais" => "french.php", "allemand" => "deutsch.php", "italian" =>"italian.php" );
-
-if(isset($_GET['correct'])&&$_GET['correct'])
-{
- list($choice,$rub,$id) = explode('_',$_GET['correct']);
- if (!$nojs || !$reset)
- {
- function do_correct($lang,$rub,$id,$text)
- {
- global $filenames;
- $file = file($filenames[$lang]);
- $to_put = "[$id] \t= \"$text\"; \n";
- for($i=0;$i<count($file);$i++)
- {
- if (eregi("^(.+lang\[\"$rub\"\])\[([0-9]*)\]",$file[$i],$ereg))
- {
- if($ereg[2]==$id)
- {
- $file[$i] = $ereg[1].$to_put;
- $r++;
- }
- elseif ($ereg[2]<$id)
- {
- $near[0]=$i;
- $near[1]=$ereg[1];
- }
- $o++;
- }
- }
- if(!$r && $near)
- {
- $file[$near[0]].=$near[1].$to_put;
- $r=1;
- }
- if($r==1)
- {
- $fp = fopen($filenames[$lang],'w');
- for($i=0;$i<count($file);$i++)
- fputs($fp,$file[$i]);
- fclose($fp);
-
- return true;
- }
- else
- {
- return false;
- }
- }
- $_GET['text'] = htmlentities($_GET['text']);
- if(do_correct($choice,$rub,$id,$_GET['text']))
- {
- if(!$nojs)
- {
- echo "
- elemc = document.getElementById('{$_GET['correct']}')
- elemc.innerHTML='{$_GET['text']}';
- elemc.style.border='2px solid transparent';
- elemc.onclick=function(){getCorrectForm(\"{$choice}_{$rub}_{$id}\",\"{$_GET['text']}\");};
- ";
- die();
- }
-
- }
- elseif(!$nojs)
- {
- die("document.getElementById('{$_GET['correct']}').innerHTML='({$_GET['text']})'");
- }
- else
- {
- $select = $_GET['correct'];
- }
- }
-}
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html>
-<head>
-<title>Transrapidos</title>
-<link rel='stylesheet' title='Transrapi' href='transrapi.css' type='text/css' media='screen' />
-<script type='text/javascript' src="transrapi.js"></script>
-</head>
-<body><div>
-
-<form id='lform' onsubmit='return false' action='?'><div id="lformdiv">
-<input type='hidden' name="rub" id="lfrub" value="<?=$rub?>"/>
-<?php
-if (isset($_GET["rub"])) $rub=$_GET["rub"];
-else $rub="";
-$lang_select=array();
-if(isset($_GET["langsub"]))
- $lang_select[$langsub]=!$lang_select[$langsub];
-$rubs=array();
-
-while ( $to_require = current($filenames))
-{
-
- $key=key($filenames);
-if($rub)
- {
- echo "\n<input class='hidden' name='lang_select[$key]' ".(!$lang_select || $lang_select[$key] ?" checked='checked'":"")." type='checkbox' id='enable_$key' /><input type='submit' class='lang".(!$lang_select || $lang_select[$key] ?"on":"off")."' id='button_$key' onclick='choice(\"$key\",document.getElementById(\"enable_$key\").checked)' name='langsub' value='$key' />";
- }
- require($to_require);
- $trans_lang[$key]=$lang;
-
- $rubs = array_merge($rubs,array_keys($lang));
- unset($lang);
- next($filenames);
-}
-echo "</div></form>";
-$rubs = array_unique($rubs);
-natcasesort($rubs);
-reset($filenames);
-echo "\n\n<ul id='menu'><li class='mainlink'><a href='?'>TransRapi</a></li>\n";
-foreach ($rubs as $value)
-{
- echo "<li".($value==$rub ? ' class="onrub"':'')
- ."><a href='?rub=$value' onclick='changeRub(\"$value\");return false;'>"
- .ucfirst($value)."</a></li>\n";
-}
-echo "</ul>\n";
-$max=0;
-if($rub)
-{
- while ( $to_view = key($filenames))
- {
- if (isset($trans_lang[$to_view][$rub]))
- $max=max($max,max(array_keys($trans_lang[$to_view][$rub])));
- next($filenames);
- }
- reset($filenames);
- while ( $to_view = key($filenames))
- {
- echo "<ul class='rub' id='{$to_view}'".(!$lang_select || $lang_select[$to_view] ?"":" style='display:none;'")."><li class='titre'>{$to_view}</li>\n";
- for($i=0;$i<=($max+1);$i++)
- {
- $key=$i;
- if (isset($trans_lang[$to_view][$rub][$i]))
- $value=$trans_lang[$to_view][$rub][$i];
- else $value="";
- echo "<li class='li".($value ? $key%2 : 'no')."' id='{$to_view}_{$rub}_{$key}' onclick='getCorrectForm(\"{$to_view}_{$rub}_{$key}\",\"$value\")'>";
- if($select=="{$to_view}_{$rub}_{$key}")
- {
- echo "<form method='get' action='?'><input type='hidden' name='nojs' value='1' /><input type='hidden' name='correct' value='$select'/><input name='text' value=\"$value\" /><br /><input class='nojs' name='reset' type='submit' value='Annuler' /><input class='nojs' type='submit' value='Valider' /></form>";
- }
- else
- {
- echo "<a href='?rub=$rub&select={$to_view}_{$rub}_{$key}' onclick='return false;'>$value</a></li>\n";
- }
- }
-
- echo "</ul>\n";
-
- next($filenames);
- }
-
-}
-else
-{
-?><div id='page'>
-<h1>Transrapi 0.3</h1>
-
-Selectionnez une section.
-
-</div>
-<?php } ?></div></body></html>
diff -Nur web/glpi/glpi/glpi/enterprises/classes.php glpi/glpi/enterprises/classes.php
--- web/glpi/glpi/glpi/enterprises/classes.php 2005-02-20 15:21:34.000000000 +0100
+++ glpi/glpi/enterprises/classes.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/enterprises/CVS/Entries glpi/glpi/enterprises/CVS/Entries
--- web/glpi/glpi/glpi/enterprises/CVS/Entries 2005-03-07 09:57:35.000000000 +0100
+++ glpi/glpi/enterprises/CVS/Entries 2005-03-07 14:02:51.000000000 +0100
@@ -1,4 +1,4 @@
-/_relpos.php/1.1/Sat Feb 19 14:17:24 2005//
-/classes.php/1.2/Sun Feb 20 14:21:34 2005//
-/functions.php/1.13/Mon Mar 7 08:57:34 2005//
+/_relpos.php/1.2/Mon Mar 7 10:44:25 2005//
+/classes.php/1.3/Mon Mar 7 10:44:25 2005//
+/functions.php/1.14/Mon Mar 7 10:44:25 2005//
D
diff -Nur web/glpi/glpi/glpi/enterprises/functions.php glpi/glpi/enterprises/functions.php
--- web/glpi/glpi/glpi/enterprises/functions.php 2005-03-07 09:57:34.000000000 +0100
+++ glpi/glpi/enterprises/functions.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/enterprises/_relpos.php glpi/glpi/enterprises/_relpos.php
--- web/glpi/glpi/glpi/enterprises/_relpos.php 2005-02-19 15:17:24.000000000 +0100
+++ glpi/glpi/enterprises/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/includes_cartridges.php glpi/glpi/includes_cartridges.php
--- web/glpi/glpi/glpi/includes_cartridges.php 2005-02-13 17:53:28.000000000 +0100
+++ glpi/glpi/includes_cartridges.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/includes_computers.php glpi/glpi/includes_computers.php
--- web/glpi/glpi/glpi/includes_computers.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/includes_computers.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/includes_devices.php glpi/glpi/includes_devices.php
--- web/glpi/glpi/glpi/includes_devices.php 2005-02-13 00:11:15.000000000 +0100
+++ glpi/glpi/includes_devices.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/includes_enterprises.php glpi/glpi/includes_enterprises.php
--- web/glpi/glpi/glpi/includes_enterprises.php 2005-03-03 16:21:58.000000000 +0100
+++ glpi/glpi/includes_enterprises.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/includes_financial.php glpi/glpi/includes_financial.php
--- web/glpi/glpi/glpi/includes_financial.php 2005-03-03 16:21:58.000000000 +0100
+++ glpi/glpi/includes_financial.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/includes_knowbase.php glpi/glpi/includes_knowbase.php
--- web/glpi/glpi/glpi/includes_knowbase.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/includes_knowbase.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/includes_monitors.php glpi/glpi/includes_monitors.php
--- web/glpi/glpi/glpi/includes_monitors.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/includes_monitors.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/includes_networking.php glpi/glpi/includes_networking.php
--- web/glpi/glpi/glpi/includes_networking.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/includes_networking.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/includes_peripherals.php glpi/glpi/includes_peripherals.php
--- web/glpi/glpi/glpi/includes_peripherals.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/includes_peripherals.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/includes.php glpi/glpi/includes.php
--- web/glpi/glpi/glpi/includes.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/includes.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/includes_printers.php glpi/glpi/includes_printers.php
--- web/glpi/glpi/glpi/includes_printers.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/includes_printers.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/includes_reservation.php glpi/glpi/includes_reservation.php
--- web/glpi/glpi/glpi/includes_reservation.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/includes_reservation.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/includes_setup.php glpi/glpi/includes_setup.php
--- web/glpi/glpi/glpi/includes_setup.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/includes_setup.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/includes_software.php glpi/glpi/includes_software.php
--- web/glpi/glpi/glpi/includes_software.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/includes_software.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/includes_tracking.php glpi/glpi/includes_tracking.php
--- web/glpi/glpi/glpi/includes_tracking.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/includes_tracking.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/infocoms/classes.php glpi/glpi/infocoms/classes.php
--- web/glpi/glpi/glpi/infocoms/classes.php 2005-03-07 09:57:35.000000000 +0100
+++ glpi/glpi/infocoms/classes.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/infocoms/CVS/Entries glpi/glpi/infocoms/CVS/Entries
--- web/glpi/glpi/glpi/infocoms/CVS/Entries 2005-03-07 09:57:35.000000000 +0100
+++ glpi/glpi/infocoms/CVS/Entries 2005-03-07 14:02:51.000000000 +0100
@@ -1,4 +1,4 @@
-/_relpos.php/1.1/Sat Feb 19 16:25:46 2005//
-/classes.php/1.5/Mon Mar 7 08:57:35 2005//
-/functions.php/1.26/Mon Mar 7 08:57:35 2005//
+/_relpos.php/1.2/Mon Mar 7 10:44:25 2005//
+/classes.php/1.6/Mon Mar 7 10:44:25 2005//
+/functions.php/1.27/Mon Mar 7 10:44:25 2005//
D
diff -Nur web/glpi/glpi/glpi/infocoms/functions.php glpi/glpi/infocoms/functions.php
--- web/glpi/glpi/glpi/infocoms/functions.php 2005-03-07 09:57:35.000000000 +0100
+++ glpi/glpi/infocoms/functions.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/infocoms/_relpos.php glpi/glpi/infocoms/_relpos.php
--- web/glpi/glpi/glpi/infocoms/_relpos.php 2005-02-19 17:25:46.000000000 +0100
+++ glpi/glpi/infocoms/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/knowbase/classes.php glpi/glpi/knowbase/classes.php
--- web/glpi/glpi/glpi/knowbase/classes.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/knowbase/classes.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
- GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
- This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/knowbase/CVS/Entries glpi/glpi/knowbase/CVS/Entries
--- web/glpi/glpi/glpi/knowbase/CVS/Entries 2005-03-07 09:57:35.000000000 +0100
+++ glpi/glpi/knowbase/CVS/Entries 2005-03-07 14:02:52.000000000 +0100
@@ -1,4 +1,4 @@
-/_relpos.php/1.2/Sat Feb 12 16:00:10 2005//
-/classes.php/1.5/Sat Feb 12 16:00:10 2005//
-/functions.php/1.20/Mon Mar 7 08:57:35 2005//
+/_relpos.php/1.3/Mon Mar 7 10:44:25 2005//
+/classes.php/1.6/Mon Mar 7 10:44:25 2005//
+/functions.php/1.21/Mon Mar 7 10:44:25 2005//
D
diff -Nur web/glpi/glpi/glpi/knowbase/functions.php glpi/glpi/knowbase/functions.php
--- web/glpi/glpi/glpi/knowbase/functions.php 2005-03-07 09:57:35.000000000 +0100
+++ glpi/glpi/knowbase/functions.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
- GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
- This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/knowbase/_relpos.php glpi/glpi/knowbase/_relpos.php
--- web/glpi/glpi/glpi/knowbase/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/knowbase/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/ldap/CVS/Entries glpi/glpi/ldap/CVS/Entries
--- web/glpi/glpi/glpi/ldap/CVS/Entries 1970-01-01 01:00:00.000000000 +0100
+++ glpi/glpi/ldap/CVS/Entries 2005-03-07 14:02:52.000000000 +0100
@@ -0,0 +1 @@
+D
diff -Nur web/glpi/glpi/glpi/ldap/CVS/Repository glpi/glpi/ldap/CVS/Repository
--- web/glpi/glpi/glpi/ldap/CVS/Repository 1970-01-01 01:00:00.000000000 +0100
+++ glpi/glpi/ldap/CVS/Repository 2005-03-07 14:02:52.000000000 +0100
@@ -0,0 +1 @@
+glpi/glpi/ldap
diff -Nur web/glpi/glpi/glpi/ldap/CVS/Root glpi/glpi/ldap/CVS/Root
--- web/glpi/glpi/glpi/ldap/CVS/Root 1970-01-01 01:00:00.000000000 +0100
+++ glpi/glpi/ldap/CVS/Root 2005-03-07 14:02:52.000000000 +0100
@@ -0,0 +1 @@
+:pserver:[EMAIL PROTECTED]
diff -Nur web/glpi/glpi/glpi/monitors/classes.php glpi/glpi/monitors/classes.php
--- web/glpi/glpi/glpi/monitors/classes.php 2005-03-07 09:57:35.000000000 +0100
+++ glpi/glpi/monitors/classes.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/monitors/CVS/Entries glpi/glpi/monitors/CVS/Entries
--- web/glpi/glpi/glpi/monitors/CVS/Entries 2005-03-07 09:57:35.000000000 +0100
+++ glpi/glpi/monitors/CVS/Entries 2005-03-07 14:02:52.000000000 +0100
@@ -1,4 +1,4 @@
-/_relpos.php/1.4/Sat Feb 12 16:00:10 2005//
-/classes.php/1.17/Mon Mar 7 08:57:35 2005//
-/functions.php/1.46/Result of merge+Mon Mar 7 08:57:35 2005//
+/_relpos.php/1.5/Mon Mar 7 10:44:25 2005//
+/classes.php/1.18/Mon Mar 7 10:44:25 2005//
+/functions.php/1.48/Mon Mar 7 11:02:39 2005//
D
diff -Nur web/glpi/glpi/glpi/monitors/functions.php glpi/glpi/monitors/functions.php
--- web/glpi/glpi/glpi/monitors/functions.php 2005-03-07 11:48:54.000000000 +0100
+++ glpi/glpi/monitors/functions.php 2005-03-07 12:02:39.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
@@ -43,7 +44,7 @@
echo "<div align='center'><table border='0'><tr><td>";
echo "<img src=\"".$HTMLRel."pics/ecran.png\" alt='".$lang["monitors"][0]."' title='".$lang["monitors"][0]."'></td><td><a class='icon_consol' href=\"monitors-add-select.php\"><b>".$lang["monitors"][0]."</b></a>";
echo "</td>";
- echo "<td><a href='".$HTMLRel."setup/setup-templates.php?type=".MONITOR_TYPE."'>".$lang["common"][8]."</a></td>";
+ echo "<td><a class='icon_consol' href='".$HTMLRel."setup/setup-templates.php?type=".MONITOR_TYPE."'>".$lang["common"][9]."</a></td>";
echo "</tr></table></div>";
}
@@ -348,16 +349,7 @@
echo "<tr><td>".$lang["monitors"][8].": </td>";
echo "<td><input type='text' name='contact' size='20' value=\"".$mon->fields["contact"]."\"></td>";
echo "</tr>";
-
-
- echo "<tr><td>".$lang["monitors"][31].": </td><td>";
- dropdownValue("glpi_contacts", "tech_num", $mon->fields["tech_num"]);
- echo "</td></tr>";
-
-
-
if (!$template){
-
echo "<tr><td>".$lang["reservation"][24].":</td><td><b>";
showReservationForm(MONITOR_TYPE,$ID);
echo "</b></td></tr>";
diff -Nur web/glpi/glpi/glpi/monitors/functions.php~ glpi/glpi/monitors/functions.php~
--- web/glpi/glpi/glpi/monitors/functions.php~ 2005-03-07 10:19:28.000000000 +0100
+++ glpi/glpi/monitors/functions.php~ 1970-01-01 01:00:00.000000000 +0100
@@ -1,605 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
-*/
-
-// Based on:
-// IRMA, Information Resource-Management and Administration
-// Christian Bauer
-// ----------------------------------------------------------------------
-// Original Author of file:
-// Purpose of file:
-// ----------------------------------------------------------------------
-
-include ("_relpos.php");
-// FUNCTIONS Monitors
-
-
-function titleMonitors(){
- GLOBAL $lang,$HTMLRel;
- echo "<div align='center'><table border='0'><tr><td>";
- echo "<img src=\"".$HTMLRel."pics/ecran.png\" alt='".$lang["monitors"][0]."' title='".$lang["monitors"][0]."'></td><td><a class='icon_consol' href=\"monitors-add-select.php\"><b>".$lang["monitors"][0]."</b></a>";
- echo "</td>";
- echo "<td><a href='".$HTMLRel."setup/setup-templates.php?type=".MONITOR_TYPE."'>".$lang["common"][8]."</a></td>";
- echo "</tr></table></div>";
-}
-
-
-function searchFormMonitors($field="",$phrasetype= "",$contains="",$sort= "",$deleted="") {
- // Print Search Form
-
- GLOBAL $cfg_install, $cfg_layout, $layout, $lang,$HTMLRel;
-
- $option["mon.name"] = $lang["monitors"][5];
- $option["mon.ID"] = $lang["monitors"][23];
- $option["glpi_dropdown_locations.name"] = $lang["monitors"][6];
- $option["glpi_type_monitors.name"] = $lang["monitors"][9];
- $option["mon.serial"] = $lang["monitors"][10];
- $option["mon.otherserial"] = $lang["monitors"][11] ;
- $option["mon.comments"] = $lang["monitors"][12];
- $option["mon.contact"] = $lang["monitors"][8];
- $option["mon.contact_num"] = $lang["monitors"][7];
- $option["mon.date_mod"] = $lang["monitors"][16];
- $option["glpi_enterprises.name"] = $lang["common"][5];
-
- echo "<form method='get' action=\"".$cfg_install["root"]."/monitors/monitors-search.php\">";
- echo "<div align='center'><table width='750' class='tab_cadre'>";
- echo "<tr><th colspan='3'><b>".$lang["search"][0].":</b></th></tr>";
- echo "<tr class='tab_bg_1'>";
- echo "<td align='center'>";
- echo "<input type='text' size='15' name=\"contains\" value=\"". $contains ."\" >";
- echo " ";
-
- echo $lang["search"][10]." ";
-
-
- echo "<select name=\"field\" size='1'>";
- echo "<option value='all' ";
- if($field == "all") echo "selected";
- echo ">".$lang["search"][7]."</option>";
- reset($option);
- foreach ($option as $key => $val) {
- echo "<option value=\"".$key."\"";
- if($key == $field) echo "selected";
- echo ">". $val ."</option>\n";
- }
- echo "</select> ";
-
-
- /*
- echo $lang["search"][1];
- echo " <select name='phrasetype' size='1' >";
- echo "<option value='contains'";
- if($phrasetype == "contains") echo "selected";
- echo ">".$lang["search"][2]."</option>";
- echo "<option value='exact'";
- if($phrasetype == "exact") echo "selected";
- echo ">".$lang["search"][3]."</option>";
- echo "</select>";
- */
-
-
- echo $lang["search"][4];
- echo " <select name='sort' size='1'>";
- reset($option);
- foreach ($option as $key => $val) {
- echo "<option value=\"".$key."\"";
- if($key == $sort) echo "selected";
- echo ">".$val."</option>\n";
- }
- echo "</select> ";
- echo "</td><td><input type='checkbox' name='deleted' ".($deleted=='Y'?" checked ":"").">";
- echo "<img src=\"".$HTMLRel."pics/showdeleted.png\" alt='".$lang["common"][3]."' title='".$lang["common"][3]."'>";
- echo "</td><td width='80' align='center' class='tab_bg_2'>";
- echo "<input type='submit' value=\"".$lang["buttons"][0]."\" class='submit'>";
- echo "</td></tr></table></div></form>";
-}
-
-
-function showMonitorList($target,$username,$field,$phrasetype,$contains,$sort,$order,$start,$deleted) {
-
- // Lists Monitors
-
- GLOBAL $cfg_install, $cfg_layout, $cfg_features, $lang, $HTMLRel;
-
- $db = new DB;
-
- // Build query
- if($field=="all") {
- $where = " (";
- $fields = $db->list_fields("glpi_monitors");
- $columns = $db->num_fields($fields);
-
- for ($i = 0; $i < $columns; $i++) {
- if($i != 0) {
- $where .= " OR ";
- }
- $coco = mysql_field_name($fields, $i);
-
- if($coco == "location") {
- $where .= " glpi_dropdown_locations.name LIKE '%".$contains."%'";
- }
- elseif($coco == "type") {
- $where .= " glpi_type_monitors.name LIKE '%".$contains."%'";
- }
- else {
- $where .= "mon.".$coco . " LIKE '%".$contains."%'";
- }
- }
-
- $where.=" OR glpi_enterprises.name LIKE '%".$contains."%'";
-
- $where .= ")";
- }
- else {
- if ($phrasetype == "contains") {
- $where = "($field LIKE '%".$contains."%')";
- }
- else {
- $where = "($field LIKE '".$contains."')";
- }
- }
-
-
-
- if (!$start) {
- $start = 0;
- }
- if (!$order) {
- $order = "ASC";
- }
- $query = "select mon.ID from glpi_monitors as mon LEFT JOIN glpi_dropdown_locations on mon.location=glpi_dropdown_locations.ID ";
- $query .= "LEFT JOIN glpi_type_monitors on mon.type = glpi_type_monitors.ID ";
- $query.= " LEFT JOIN glpi_enterprises ON (glpi_enterprises.ID = mon.FK_glpi_enterprise ) ";
- $query .= " where $where AND mon.deleted='$deleted' AND mon.is_template = '0' ORDER BY $sort $order";
-// echo $query;
- // Get it from database
- if ($result = $db->query($query)) {
- $numrows= $db->numrows($result);
-
- // Limit the result, if no limit applies, use prior result
- if ($numrows>$cfg_features["list_limit"]) {
- $query_limit = $query ." LIMIT $start,".$cfg_features["list_limit"]." ";
- $result_limit = $db->query($query_limit);
- $numrows_limit = $db->numrows($result_limit);
- } else {
- $numrows_limit = $numrows;
- $result_limit = $result;
- }
-
-
- if ($numrows_limit>0) {
- // Produce headline
- echo "<center><table class='tab_cadre'><tr>";
-
- // Name
- echo "<th>";
- if ($sort=="mon.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=mon.name&order=ASC&start=$start\">";
- echo $lang["monitors"][5]."</a></th>";
-
- // Manufacturer
- echo "<th>";
- if ($sort=="glpi_enterprises.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_enterprises.name&order=ASC&start=$start\">";
- echo $lang["common"][5]."</a></th>";
-
- // Location
- echo "<th>";
- if ($sort=="glpi_dropdown_locations.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_dropdown_locations.name&order=ASC&start=$start\">";
- echo $lang["monitors"][6]."</a></th>";
-
- // Type
- echo "<th>";
- if ($sort=="glpi_type_monitors.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_type_monitors.name&order=ASC&start=$start\">";
- echo $lang["monitors"][9]."</a></th>";
-
- // Last modified
- echo "<th>";
- if ($sort=="mon.date_mod") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=mon.date_mod&order=DESC&start=$start\">";
- echo $lang["monitors"][16]."</a></th>";
-
- // Contact person
- echo "<th>";
- if ($sort=="mon.contact") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=mon.contact&order=ASC&start=$start\">";
- echo $lang["monitors"][8]."</a></th>";
-
- echo "</tr>";
-
- for ($i=0; $i < $numrows_limit; $i++) {
- $ID = $db->result($result_limit, $i, "mon.ID");
- $mon = new Monitor;
- $mon->getfromDB($ID);
- echo "<tr class='tab_bg_2'>";
- echo "<td><b>";
- echo "<a href=\"".$cfg_install["root"]."/monitors/monitors-info-form.php?ID=$ID\">";
- echo $mon->fields["name"]." (".$mon->fields["ID"].")";
- echo "</a></b></td>";
- echo "<td>". getDropdownName("glpi_enterprises",$mon->fields["FK_glpi_enterprise"]) ."</td>";
- echo "<td>". getDropdownName("glpi_dropdown_locations",$mon->fields["location"]) ."</td>";
- echo "<td>". getDropdownName("glpi_type_monitors",$mon->fields["type"]) ."</td>";
- echo "<td>".$mon->fields["date_mod"]."</td>";
- echo "<td>".$mon->fields["contact"]."</td>";
- echo "</tr>";
- }
-
- // Close Table
- echo "</table></center>";
-
- // Pager
- $parameters="field=$field&phrasetype=$phrasetype&contains=$contains&sort=$sort&order=$order";
- printPager($start,$numrows,$target,$parameters);
-
- } else {
- echo "<center><b>".$lang["monitors"][17]."</b></center>";
- echo "<hr noshade>";
- }
- }
-}
-
-
-function showMonitorsForm ($target,$ID,$withtemplate='') {
-
- GLOBAL $cfg_install, $cfg_layout, $lang,$HTMLRel;
-
- $mon = new Monitor;
- $mon_spotted = false;
-
- if(empty($ID) && $withtemplate == 1) {
- if($mon->getEmpty()) $mon_spotted = true;
- } else {
- if($mon->getfromDB($ID)) $mon_spotted = true;
- }
-
- if($mon_spotted) {
- if(!empty($withtemplate) && $withtemplate == 2) {
- $template = "newcomp";
- $datestring = $lang["computers"][14].": ";
- $date = date("Y-m-d H:i:s");
- } elseif(!empty($withtemplate) && $withtemplate == 1) {
- $template = "newtemplate";
- $datestring = $lang["computers"][14].": ";
- $date = date("Y-m-d H:i:s");
- } else {
- $datestring = $lang["computers"][11]." : ";
- $date = $mon->fields["date_mod"];
- $template = false;
- }
-
- echo "<div align='center'><form method='post' name=form action=\"$target\">";
- if(strcmp($template,"newtemplate") === 0) {
- echo "<input type=\"hidden\" name=\"is_template\" value=\"1\" />";
- }
-
- echo "<table class='tab_cadre' cellpadding='2'>";
-
- echo "<tr><th align='center' >";
- if(!$template) {
- echo $lang["monitors"][29].": ".$mon->fields["ID"];
- }elseif (strcmp($template,"newcomp") === 0) {
- echo $lang["monitors"][30].": ".$mon->fields["tplname"];
- }elseif (strcmp($template,"newtemplate") === 0) {
- echo $lang["common"][6]." : <input type='text' name='tplname' value=\"".$mon->fields["tplname"]."\" size='20'>";
- }
-
- echo "</th><th align='center'>".$datestring.$date;
- echo "</th></tr>";
-
-
- echo "<tr><td class='tab_bg_1' valign='top'>";
-
- echo "<table cellpadding='1px' cellspacing='0' border='0'>\n";
-
- echo "<tr><td>".$lang["monitors"][5].": </td>";
- echo "<td><input type='text' name='name' value=\"".$mon->fields["name"]."\" size='20'></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["monitors"][6].": </td><td>";
- dropdownValue("glpi_dropdown_locations", "location", $mon->fields["location"]);
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_1'><td>".$lang["common"][5].": </td><td colspan='2'>";
- dropdownValue("glpi_enterprises","FK_glpi_enterprise",$mon->fields["FK_glpi_enterprise"]);
- echo "</td></tr>";
-
- echo "<tr><td>".$lang["monitors"][7].": </td>";
- echo "<td><input type='text' name='contact_num' value=\"".$mon->fields["contact_num"]."\" size='20'></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["monitors"][8].": </td>";
- echo "<td><input type='text' name='contact' size='20' value=\"".$mon->fields["contact"]."\"></td>";
- echo "</tr>";
-//<<<<<<< functions.php
-
- echo "<tr><td>".$lang["monitors"][31].": </td><td>";
- dropdownValue("glpi_contacts", "tech_num", $mon->fields["tech_num"]);
- echo "</td></tr>";
-
-/* if (!empty($ID)){
-=======*/
- if (!$template){
-//>>>>>>> 1.46
- echo "<tr><td>".$lang["reservation"][24].":</td><td><b>";
- showReservationForm(MONITOR_TYPE,$ID);
- echo "</b></td></tr>";
- }
-
- echo "</table>";
-
- echo "</td>\n";
- echo "<td class='tab_bg_1' valign='top'>";
-
- echo "<table cellpadding='1px' cellspacing='0' border='0'";
-
- echo "<tr><td>".$lang["monitors"][9].": </td><td>";
- dropdownValue("glpi_type_monitors", "type", $mon->fields["type"]);
- echo "</td></tr>";
-
- echo "<tr><td>".$lang["monitors"][10].": </td>";
- echo "<td><input type='text' name='serial' size='20' value=\"".$mon->fields["serial"]."\"></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["monitors"][11].":</td>";
- echo "<td><input type='text' size='20' name='otherserial' value=\"".$mon->fields["otherserial"]."\"></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["monitors"][21].":</td>";
- echo "<td><input type='text' size='2' name='size' value=\"".$mon->fields["size"]."\">\"</td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["monitors"][18].": </td><td>";
-
- // micro?
- echo "<table border='0' cellpadding='2' cellspacing='0'><tr>";
- echo "<td>";
- if ($mon->fields["flags_micro"] == 1) {
- echo "<input type='checkbox' name='flags_micro' value='1' checked>";
- } else {
- echo "<input type='checkbox' name='flags_micro' value='1''>";
- }
- echo "</td><td>".$lang["monitors"][14]."</td>";
- echo "</tr></table>";
-
- // speakers?
- echo "<table border='0' cellpadding='2' cellspacing='0'><tr>";
- echo "<td>";
- if ($mon->fields["flags_speaker"] == 1) {
- echo "<input type='checkbox' name='flags_speaker' value='1' checked>";
- } else {
- echo "<input type='checkbox' name='flags_speaker' value='1'>";
- }
- echo "</td><td>".$lang["monitors"][15]."</td>";
- echo "</tr></table>";
-
- // sub-d?
- echo "<table border='0' cellpadding='2' cellspacing='0'><tr>";
- echo "<td>";
- if ($mon->fields["flags_subd"] == 1) {
- echo "<input type='checkbox' name='flags_subd' value='1' checked>";
- } else {
- echo "<input type='checkbox' name='flags_subd' value='1'>";
- }
- echo "</td><td>".$lang["monitors"][19]."</td>";
- echo "</tr></table>";
-
- // bnc?
- echo "<table border='0' cellpadding='2' cellspacing='0'><tr>";
- echo "<td>";
- if ($mon->fields["flags_bnc"] == 1) {
- echo "<input type='checkbox' name='flags_bnc' value='1' checked>";
- } else {
- echo "<input type='checkbox' name='flags_bnc' value='1'>";
- }
- echo "</td><td>".$lang["monitors"][20]."</td>";
- echo "</tr></table>";
-
-
-echo "</td></tr>";
-
- echo "</table>";
- echo "</td>\n";
- echo "</tr>";
- echo "<tr>";
- echo "<td class='tab_bg_1' valign='top' colspan='2'>";
-
- echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'><tr><td valign='top'>";
- echo $lang["monitors"][12].": </td>";
- echo "<td align='center'><textarea cols='35' rows='4' name='comments' >".$mon->fields["comments"]."</textarea>";
- echo "</td></tr></table>";
-
- echo "</td>";
- echo "</tr>";
-
- echo "<tr>";
-
- if ($template) {
-
- if (empty($ID)||$withtemplate==2){
- echo "<td class='tab_bg_2' align='center' colspan='2'>\n";
- echo "<input type='hidden' name='ID' value=$ID>";
- echo "<input type='submit' name='add' value=\"".$lang["buttons"][8]."\" class='submit'>";
- echo "</td>\n";
- } else {
- echo "<td class='tab_bg_2' align='center' colspan='2'>\n";
- echo "<input type='hidden' name='ID' value=$ID>";
- echo "<input type='submit' name='update' value=\"".$lang["buttons"][7]."\" class='submit'>";
- echo "</td>\n";
- }
-
-
- } else {
-
- echo "<td class='tab_bg_2' valign='top'>";
- echo "<input type='hidden' name='ID' value=\"$ID\">\n";
- echo "<center><input type='submit' name='update' value=\"".$lang["buttons"][7]."\" class='submit' class='submit'></center>";
- echo "</td></form>\n\n";
- echo "<form action=\"$target\" method='post'>\n";
- echo "<td class='tab_bg_2' valign='top'>\n";
- echo "<input type='hidden' name='ID' value=\"$ID\">\n";
- echo "<div align='center'>";
- if ($mon->fields["deleted"]=='N')
- echo "<input type='submit' name='delete' value=\"".$lang["buttons"][6]."\" class='submit'>";
- else {
- echo "<input type='submit' name='restore' value=\"".$lang["buttons"][21]."\" class='submit'>";
-
- echo " <input type='submit' name='purge' value=\"".$lang["buttons"][22]."\" class='submit'>";
- }
- echo "</div>";
- echo "</td>";
- }
- echo "</form></tr>";
-
- echo "</table></div>";
-
- return true;
- }
- else {
- echo "<div align='center'><b>".$lang["monitors"][17]."</b></div>";
- echo "<hr noshade>";
- searchFormMonitors();
- return false;
- }
-
-
-
-}
-
-
-function updateMonitor($input) {
- // Update a monitor in the database
-
- $mon = new Monitor;
- $mon->getFromDB($input["ID"]);
-
- // set new date and make sure it gets updated
- $updates[0]= "date_mod";
- $mon->fields["date_mod"] = date("Y-m-d H:i:s");
-
- // Pop off the last two attributes, no longer needed
- $null=array_pop($input);
- $null=array_pop($input);
-
- // Get all flags and fill with 0 if unchecked in form
- foreach ($mon->fields as $key => $val) {
- if (eregi("\.*flag\.*",$key)) {
- if (!isset($input[$key])) {
- $input[$key]=0;
- }
- }
- }
-
- // Fill the update-array with changes
- $x=1;
- foreach ($input as $key => $val) {
- if ($mon->fields[$key] != $input[$key]) {
- $mon->fields[$key] = $input[$key];
- $updates[$x] = $key;
- $x++;
- }
- }
-
- $mon->updateInDB($updates);
-
-}
-
-function addMonitor($input) {
- // Add Monitor, nasty hack until we get PHP4-array-functions
- $db=new DB;
-
- $mon = new Monitor;
-
- // dump status
- $oldID=$input["ID"];
-
- $null = array_pop($input);
- $null = array_pop($input);
-
- // set new date.
- $mon->fields["date_mod"] = date("Y-m-d H:i:s");
-
- // fill array for udpate
- foreach ($input as $key => $val) {
- if (!isset($mon->fields[$key]) || $mon->fields[$key] != $input[$key]) {
- $mon->fields[$key] = $input[$key];
- }
- }
-
- $mon->addToDB();
- $newID=$mon->getInsertElementID();
-
- // ADD Infocoms
- $ic= new Infocom();
- if ($ic->getFromDB(MONITOR_TYPE,$oldID)){
- $ic->fields["FK_device"]=$newID;
- unset ($ic->fields["ID"]);
- $ic->addToDB();
- }
-
- // ADD Contract
- $query="SELECT FK_contract from glpi_contract_device WHERE FK_device='$oldID' AND device_type='".MONITOR_TYPE."';";
- $result=$db->query($query);
- if ($db->numrows($result)>0){
-
- while ($data=$db->fetch_array($result))
- addDeviceContract($data["FK_contract"],MONITOR_TYPE,$newID);
- }
-
-
-
-}
-
-function deleteMonitor($input,$force=0) {
- // Delete Printer
-
- $mon = new Monitor;
- $mon->deleteFromDB($input["ID"],$force);
-
-}
-
-function restoreMonitor($input) {
- // Restore Monitor
-
- $mon = new Monitor;
- $mon->restoreInDB($input["ID"]);
-}
-
-?>
diff -Nur web/glpi/glpi/glpi/monitors/.#functions.php.1.42 glpi/glpi/monitors/.#functions.php.1.42
--- web/glpi/glpi/glpi/monitors/.#functions.php.1.42 2005-03-04 12:23:35.000000000 +0100
+++ glpi/glpi/monitors/.#functions.php.1.42 1970-01-01 01:00:00.000000000 +0100
@@ -1,526 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
-*/
-
-// Based on:
-// IRMA, Information Resource-Management and Administration
-// Christian Bauer
-// ----------------------------------------------------------------------
-// Original Author of file:
-// Purpose of file:
-// ----------------------------------------------------------------------
-
-include ("_relpos.php");
-// FUNCTIONS Monitors
-
-
-function titleMonitors(){
- GLOBAL $lang,$HTMLRel;
- echo "<div align='center'><table border='0'><tr><td>";
- echo "<img src=\"".$HTMLRel."pics/ecran.png\" alt='".$lang["monitors"][0]."' title='".$lang["monitors"][0]."'></td><td><a class='icon_consol' href=\"monitors-info-form.php?new=1\"><b>".$lang["monitors"][0]."</b></a>";
- echo "</td></tr></table></div>";
-}
-
-
-function searchFormMonitors($field="",$phrasetype= "",$contains="",$sort= "",$deleted="") {
- // Print Search Form
-
- GLOBAL $cfg_install, $cfg_layout, $layout, $lang,$HTMLRel;
-
- $option["mon.name"] = $lang["monitors"][5];
- $option["mon.ID"] = $lang["monitors"][23];
- $option["glpi_dropdown_locations.name"] = $lang["monitors"][6];
- $option["glpi_type_monitors.name"] = $lang["monitors"][9];
- $option["mon.serial"] = $lang["monitors"][10];
- $option["mon.otherserial"] = $lang["monitors"][11] ;
- $option["mon.comments"] = $lang["monitors"][12];
- $option["mon.contact"] = $lang["monitors"][8];
- $option["mon.contact_num"] = $lang["monitors"][7];
- $option["mon.date_mod"] = $lang["monitors"][16];
- $option["glpi_enterprises.name"] = $lang["common"][5];
-
- echo "<form method='get' action=\"".$cfg_install["root"]."/monitors/monitors-search.php\">";
- echo "<div align='center'><table width='750' class='tab_cadre'>";
- echo "<tr><th colspan='3'><b>".$lang["search"][0].":</b></th></tr>";
- echo "<tr class='tab_bg_1'>";
- echo "<td align='center'>";
- echo "<input type='text' size='15' name=\"contains\" value=\"". $contains ."\" >";
- echo " ";
-
- echo $lang["search"][10]." ";
-
-
- echo "<select name=\"field\" size='1'>";
- echo "<option value='all' ";
- if($field == "all") echo "selected";
- echo ">".$lang["search"][7]."</option>";
- reset($option);
- foreach ($option as $key => $val) {
- echo "<option value=\"".$key."\"";
- if($key == $field) echo "selected";
- echo ">". $val ."</option>\n";
- }
- echo "</select> ";
-
-
- /*
- echo $lang["search"][1];
- echo " <select name='phrasetype' size='1' >";
- echo "<option value='contains'";
- if($phrasetype == "contains") echo "selected";
- echo ">".$lang["search"][2]."</option>";
- echo "<option value='exact'";
- if($phrasetype == "exact") echo "selected";
- echo ">".$lang["search"][3]."</option>";
- echo "</select>";
- */
-
-
- echo $lang["search"][4];
- echo " <select name='sort' size='1'>";
- reset($option);
- foreach ($option as $key => $val) {
- echo "<option value=\"".$key."\"";
- if($key == $sort) echo "selected";
- echo ">".$val."</option>\n";
- }
- echo "</select> ";
- echo "</td><td><input type='checkbox' name='deleted' ".($deleted=='Y'?" checked ":"").">";
- echo "<img src=\"".$HTMLRel."pics/showdeleted.png\" alt='".$lang["common"][3]."' title='".$lang["common"][3]."'>";
- echo "</td><td width='80' align='center' class='tab_bg_2'>";
- echo "<input type='submit' value=\"".$lang["buttons"][0]."\" class='submit'>";
- echo "</td></tr></table></div></form>";
-}
-
-
-function showMonitorList($target,$username,$field,$phrasetype,$contains,$sort,$order,$start,$deleted) {
-
- // Lists Monitors
-
- GLOBAL $cfg_install, $cfg_layout, $cfg_features, $lang, $HTMLRel;
-
- $db = new DB;
-
- // Build query
- if($field=="all") {
- $where = " (";
- $fields = $db->list_fields("glpi_monitors");
- $columns = $db->num_fields($fields);
-
- for ($i = 0; $i < $columns; $i++) {
- if($i != 0) {
- $where .= " OR ";
- }
- $coco = mysql_field_name($fields, $i);
-
- if($coco == "location") {
- $where .= " glpi_dropdown_locations.name LIKE '%".$contains."%'";
- }
- elseif($coco == "type") {
- $where .= " glpi_type_monitors.name LIKE '%".$contains."%'";
- }
- else {
- $where .= "mon.".$coco . " LIKE '%".$contains."%'";
- }
- }
-
- $where.=" OR glpi_enterprises.name LIKE '%".$contains."%'";
-
- $where .= ")";
- }
- else {
- if ($phrasetype == "contains") {
- $where = "($field LIKE '%".$contains."%')";
- }
- else {
- $where = "($field LIKE '".$contains."')";
- }
- }
-
-
-
- if (!$start) {
- $start = 0;
- }
- if (!$order) {
- $order = "ASC";
- }
- $query = "select mon.ID from glpi_monitors as mon LEFT JOIN glpi_dropdown_locations on mon.location=glpi_dropdown_locations.ID ";
- $query .= "LEFT JOIN glpi_type_monitors on mon.type = glpi_type_monitors.ID ";
- $query.= " LEFT JOIN glpi_enterprises ON (glpi_enterprises.ID = mon.FK_glpi_enterprise ) ";
- $query .= " where $where AND mon.deleted='$deleted' ORDER BY $sort $order";
-// echo $query;
- // Get it from database
- if ($result = $db->query($query)) {
- $numrows= $db->numrows($result);
-
- // Limit the result, if no limit applies, use prior result
- if ($numrows>$cfg_features["list_limit"]) {
- $query_limit = $query ." LIMIT $start,".$cfg_features["list_limit"]." ";
- $result_limit = $db->query($query_limit);
- $numrows_limit = $db->numrows($result_limit);
- } else {
- $numrows_limit = $numrows;
- $result_limit = $result;
- }
-
-
- if ($numrows_limit>0) {
- // Produce headline
- echo "<center><table class='tab_cadre'><tr>";
-
- // Name
- echo "<th>";
- if ($sort=="mon.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=mon.name&order=ASC&start=$start\">";
- echo $lang["monitors"][5]."</a></th>";
-
- // Manufacturer
- echo "<th>";
- if ($sort=="glpi_enterprises.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_enterprises.name&order=ASC&start=$start\">";
- echo $lang["common"][5]."</a></th>";
-
- // Location
- echo "<th>";
- if ($sort=="glpi_dropdown_locations.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_dropdown_locations.name&order=ASC&start=$start\">";
- echo $lang["monitors"][6]."</a></th>";
-
- // Type
- echo "<th>";
- if ($sort=="glpi_type_monitors.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_type_monitors.name&order=ASC&start=$start\">";
- echo $lang["monitors"][9]."</a></th>";
-
- // Last modified
- echo "<th>";
- if ($sort=="mon.date_mod") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=mon.date_mod&order=DESC&start=$start\">";
- echo $lang["monitors"][16]."</a></th>";
-
- // Contact person
- echo "<th>";
- if ($sort=="mon.contact") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=mon.contact&order=ASC&start=$start\">";
- echo $lang["monitors"][8]."</a></th>";
-
- echo "</tr>";
-
- for ($i=0; $i < $numrows_limit; $i++) {
- $ID = $db->result($result_limit, $i, "mon.ID");
- $mon = new Monitor;
- $mon->getfromDB($ID);
- echo "<tr class='tab_bg_2'>";
- echo "<td><b>";
- echo "<a href=\"".$cfg_install["root"]."/monitors/monitors-info-form.php?ID=$ID\">";
- echo $mon->fields["name"]." (".$mon->fields["ID"].")";
- echo "</a></b></td>";
- echo "<td>". getDropdownName("glpi_enterprises",$mon->fields["FK_glpi_enterprise"]) ."</td>";
- echo "<td>". getDropdownName("glpi_dropdown_locations",$mon->fields["location"]) ."</td>";
- echo "<td>". getDropdownName("glpi_type_monitors",$mon->fields["type"]) ."</td>";
- echo "<td>".$mon->fields["date_mod"]."</td>";
- echo "<td>".$mon->fields["contact"]."</td>";
- echo "</tr>";
- }
-
- // Close Table
- echo "</table></center>";
-
- // Pager
- $parameters="field=$field&phrasetype=$phrasetype&contains=$contains&sort=$sort&order=$order";
- printPager($start,$numrows,$target,$parameters);
-
- } else {
- echo "<center><b>".$lang["monitors"][17]."</b></center>";
- echo "<hr noshade>";
- }
- }
-}
-
-
-function showMonitorsForm ($target,$ID) {
-
- GLOBAL $cfg_install, $cfg_layout, $lang,$HTMLRel;
-
- $mon = new Monitor;
-
- echo "<center><form method='post' name=form action=\"$target\">";
- echo "<table class='tab_cadre' cellpadding='2'>";
- echo "<tr><th colspan='2'><b>";
- if (empty($ID)) {
- echo $lang["monitors"][3].":";
- $mon->getEmpty();
- } else {
- $mon->getfromDB($ID);
- echo $lang["monitors"][4]." ID $ID:";
- }
- echo "</b></th></tr>";
-
- echo "<tr><td class='tab_bg_1' valign='top'>";
-
- echo "<table cellpadding='1px' cellspacing='0' border='0'>\n";
-
- echo "<tr><td>".$lang["monitors"][5].": </td>";
- echo "<td><input type='text' name='name' value=\"".$mon->fields["name"]."\" size='20'></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["monitors"][6].": </td><td>";
- dropdownValue("glpi_dropdown_locations", "location", $mon->fields["location"]);
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_1'><td>".$lang["common"][5].": </td><td colspan='2'>";
- dropdownValue("glpi_enterprises","FK_glpi_enterprise",$mon->fields["FK_glpi_enterprise"]);
- echo "</td></tr>";
-
- echo "<tr><td>".$lang["monitors"][7].": </td>";
- echo "<td><input type='text' name='contact_num' value=\"".$mon->fields["contact_num"]."\" size='20'></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["monitors"][8].": </td>";
- echo "<td><input type='text' name='contact' size='20' value=\"".$mon->fields["contact"]."\"></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["monitors"][29].": </td><td>";
- dropdownValue("glpi_contacts", "tech_num", $mon->fields["tech_num"]);
- echo "</td></tr>";
-
- if (!empty($ID)){
- echo "<tr><td>".$lang["reservation"][24].":</td><td><b>";
- showReservationForm(4,$ID);
- echo "</b></td></tr>";
- }
-
- echo "</table>";
-
- echo "</td>\n";
- echo "<td class='tab_bg_1' valign='top'>";
-
- echo "<table cellpadding='1px' cellspacing='0' border='0'";
-
- echo "<tr><td>".$lang["monitors"][9].": </td><td>";
- dropdownValue("glpi_type_monitors", "type", $mon->fields["type"]);
- echo "</td></tr>";
-
- echo "<tr><td>".$lang["monitors"][10].": </td>";
- echo "<td><input type='text' name='serial' size='20' value=\"".$mon->fields["serial"]."\"></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["monitors"][11].":</td>";
- echo "<td><input type='text' size='20' name='otherserial' value=\"".$mon->fields["otherserial"]."\"></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["monitors"][21].":</td>";
- echo "<td><input type='text' size='2' name='size' value=\"".$mon->fields["size"]."\">\"</td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["monitors"][18].": </td><td>";
-
- // micro?
- echo "<table border='0' cellpadding='2' cellspacing='0'><tr>";
- echo "<td>";
- if ($mon->fields["flags_micro"] == 1) {
- echo "<input type='checkbox' name='flags_micro' value='1' checked>";
- } else {
- echo "<input type='checkbox' name='flags_micro' value='1''>";
- }
- echo "</td><td>".$lang["monitors"][14]."</td>";
- echo "</tr></table>";
-
- // speakers?
- echo "<table border='0' cellpadding='2' cellspacing='0'><tr>";
- echo "<td>";
- if ($mon->fields["flags_speaker"] == 1) {
- echo "<input type='checkbox' name='flags_speaker' value='1' checked>";
- } else {
- echo "<input type='checkbox' name='flags_speaker' value='1'>";
- }
- echo "</td><td>".$lang["monitors"][15]."</td>";
- echo "</tr></table>";
-
- // sub-d?
- echo "<table border='0' cellpadding='2' cellspacing='0'><tr>";
- echo "<td>";
- if ($mon->fields["flags_subd"] == 1) {
- echo "<input type='checkbox' name='flags_subd' value='1' checked>";
- } else {
- echo "<input type='checkbox' name='flags_subd' value='1'>";
- }
- echo "</td><td>".$lang["monitors"][19]."</td>";
- echo "</tr></table>";
-
- // bnc?
- echo "<table border='0' cellpadding='2' cellspacing='0'><tr>";
- echo "<td>";
- if ($mon->fields["flags_bnc"] == 1) {
- echo "<input type='checkbox' name='flags_bnc' value='1' checked>";
- } else {
- echo "<input type='checkbox' name='flags_bnc' value='1'>";
- }
- echo "</td><td>".$lang["monitors"][20]."</td>";
- echo "</tr></table>";
-
-
-echo "</td></tr>";
-
- echo "</table>";
- echo "</td>\n";
- echo "</tr>";
- echo "<tr>";
- echo "<td class='tab_bg_1' valign='top' colspan='2'>";
-
- echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'><tr><td valign='top'>";
- echo $lang["monitors"][12].": </td>";
- echo "<td align='center'><textarea cols='35' rows='4' name='comments' >".$mon->fields["comments"]."</textarea>";
- echo "</td></tr></table>";
-
- echo "</td>";
- echo "</tr>";
-
- if ($ID=="") {
-
- echo "<tr>";
- echo "<td class='tab_bg_2' valign='top' colspan='2'>";
- echo "<center><input type='submit' name='add' value=\"".$lang["buttons"][8]."\" class='submit'></center>";
- echo "</td>";
- echo "</form></tr>";
-
- echo "</table></center>";
-
- } else {
-
- echo "<tr>";
- echo "<td class='tab_bg_2' valign='top'>";
- echo "<input type='hidden' name='ID' value=\"$ID\">\n";
- echo "<center><input type='submit' name='update' value=\"".$lang["buttons"][7]."\" class='submit' class='submit'></center>";
- echo "</td></form>\n\n";
- echo "<form action=\"$target\" method='post'>\n";
- echo "<td class='tab_bg_2' valign='top'>\n";
- echo "<input type='hidden' name='ID' value=\"$ID\">\n";
- echo "<div align='center'>";
- if ($mon->fields["deleted"]=='N')
- echo "<input type='submit' name='delete' value=\"".$lang["buttons"][6]."\" class='submit'>";
- else {
- echo "<input type='submit' name='restore' value=\"".$lang["buttons"][21]."\" class='submit'>";
-
- echo " <input type='submit' name='purge' value=\"".$lang["buttons"][22]."\" class='submit'>";
- }
- echo "</div>";
- echo "</td>";
- echo "</form></tr>";
-
- echo "</table></center>";
-
- showConnect($target,$ID,MONITOR_TYPE);
- }
-}
-
-
-function updateMonitor($input) {
- // Update a monitor in the database
-
- $mon = new Monitor;
- $mon->getFromDB($input["ID"]);
-
- // set new date and make sure it gets updated
- $updates[0]= "date_mod";
- $mon->fields["date_mod"] = date("Y-m-d H:i:s");
-
- // Pop off the last two attributes, no longer needed
- $null=array_pop($input);
- $null=array_pop($input);
-
- // Get all flags and fill with 0 if unchecked in form
- foreach ($mon->fields as $key => $val) {
- if (eregi("\.*flag\.*",$key)) {
- if (!isset($input[$key])) {
- $input[$key]=0;
- }
- }
- }
-
- // Fill the update-array with changes
- $x=1;
- foreach ($input as $key => $val) {
- if ($mon->fields[$key] != $input[$key]) {
- $mon->fields[$key] = $input[$key];
- $updates[$x] = $key;
- $x++;
- }
- }
-
- $mon->updateInDB($updates);
-
-}
-
-function addMonitor($input) {
- // Add Monitor, nasty hack until we get PHP4-array-functions
-
- $mon = new Monitor;
-
- // dump status
- $null = array_pop($input);
-
- // fill array for udpate
- foreach ($input as $key => $val) {
- if (!isset($mon->fields[$key]) || $mon->fields[$key] != $input[$key]) {
- $mon->fields[$key] = $input[$key];
- }
- }
-
- $mon->addToDB();
-
-}
-
-function deleteMonitor($input,$force=0) {
- // Delete Printer
-
- $mon = new Monitor;
- $mon->deleteFromDB($input["ID"],$force);
-
-}
-
-function restoreMonitor($input) {
- // Restore Monitor
-
- $mon = new Monitor;
- $mon->restoreInDB($input["ID"]);
-}
-
-?>
diff -Nur web/glpi/glpi/glpi/monitors/_relpos.php glpi/glpi/monitors/_relpos.php
--- web/glpi/glpi/glpi/monitors/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/monitors/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/networking/classes.php glpi/glpi/networking/classes.php
--- web/glpi/glpi/glpi/networking/classes.php 2005-03-07 09:57:35.000000000 +0100
+++ glpi/glpi/networking/classes.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/networking/CVS/Entries glpi/glpi/networking/CVS/Entries
--- web/glpi/glpi/glpi/networking/CVS/Entries 2005-03-07 09:57:35.000000000 +0100
+++ glpi/glpi/networking/CVS/Entries 2005-03-07 14:02:52.000000000 +0100
@@ -1,4 +1,4 @@
-/_relpos.php/1.4/Sat Feb 12 16:00:10 2005//
-/classes.php/1.26/Mon Mar 7 08:57:35 2005//
-/functions.php/1.87/Result of merge+Mon Mar 7 08:57:35 2005//
+/_relpos.php/1.5/Mon Mar 7 10:44:25 2005//
+/classes.php/1.27/Mon Mar 7 10:44:25 2005//
+/functions.php/1.89/Mon Mar 7 11:02:39 2005//
D
diff -Nur web/glpi/glpi/glpi/networking/functions.php glpi/glpi/networking/functions.php
--- web/glpi/glpi/glpi/networking/functions.php 2005-03-07 11:45:50.000000000 +0100
+++ glpi/glpi/networking/functions.php 2005-03-07 12:02:39.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
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
- ----------------------------------------------------------------------
+ ------------------------------------------------------------------------
*/
// Based on:
@@ -46,7 +46,7 @@
echo "<div align='center'><table border='0'><tr><td>";
echo "<img src=\"".$HTMLRel."pics/networking.png\" alt='".$lang["networking"][11]."' title='".$lang["networking"][11]."'></td><td><a class='icon_consol' href=\"networking-add-select.php\"><b>".$lang["networking"][11]."</b></a>";
echo "</td>";
- echo "<td><a href='".$HTMLRel."setup/setup-templates.php?type=".NETWORKING_TYPE."'>".$lang["common"][8]."</a></td>";
+ echo "<td><a class='icon_consol' href='".$HTMLRel."setup/setup-templates.php?type=".NETWORKING_TYPE."'>".$lang["common"][9]."</a></td>";
echo "</tr></table></div>";
}
@@ -365,16 +365,7 @@
echo "<td><input type='text' name='contact' size='20' value=\"".$netdev->fields["contact"]."\"></td>";
echo "</tr>";
-
- echo "<tr><td>".$lang["networking"][55].": </td><td>";
- dropdownValue("glpi_contacts", "tech_num", $netdev->fields["tech_num"]);
- echo "</td></tr>";
-
-
-
-
if (!$template){
-
echo "<tr><td>".$lang["reservation"][24].":</td><td><b>";
showReservationForm(NETWORKING_TYPE,$ID);
echo "</b></td></tr>";
diff -Nur web/glpi/glpi/glpi/networking/functions.php~ glpi/glpi/networking/functions.php~
--- web/glpi/glpi/glpi/networking/functions.php~ 2005-03-07 11:38:06.000000000 +0100
+++ glpi/glpi/networking/functions.php~ 1970-01-01 01:00:00.000000000 +0100
@@ -1,1198 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
- ----------------------------------------------------------------------
-*/
-
-// Based on:
-// IRMA, Information Resource-Management and Administration
-// Christian Bauer
-// ----------------------------------------------------------------------
-// Original Author of file:
-// Purpose of file:
-// ----------------------------------------------------------------------
-
-include ("_relpos.php");
-///// Manage Netdevices /////
-
-function titleNetdevices() {
- // titre
-
- GLOBAL $lang,$HTMLRel;
-
- echo "<div align='center'><table border='0'><tr><td>";
- echo "<img src=\"".$HTMLRel."pics/networking.png\" alt='".$lang["networking"][11]."' title='".$lang["networking"][11]."'></td><td><a class='icon_consol' href=\"networking-add-select.php\"><b>".$lang["networking"][11]."</b></a>";
- echo "</td>";
- echo "<td><a href='".$HTMLRel."setup/setup-templates.php?type=".NETWORKING_TYPE."'>".$lang["common"][8]."</a></td>";
- echo "</tr></table></div>";
-
-}
-
-function searchFormNetworking($field="",$phrasetype= "",$contains="",$sort= "",$deleted= "") {
- // Netwokirng Search Form
-
- GLOBAL $cfg_install, $cfg_layout, $layout, $lang,$HTMLRel;
-
- $option["glpi_networking.name"] = $lang["networking"][0];
- $option["glpi_networking.ID"] = $lang["networking"][50];
- $option["glpi_dropdown_locations.name"] = $lang["networking"][1];
- $option["glpi_type_networking.name"] = $lang["networking"][2];
- $option["glpi_networking.serial"] = $lang["networking"][6];
- $option["glpi_networking.otherserial"] = $lang["networking"][7] ;
- $option["glpi_dropdown_firmware.name"] = $lang["networking"][49] ;
- $option["glpi_networking.comments"] = $lang["networking"][8];
- $option["glpi_networking.contact"] = $lang["networking"][3];
- $option["glpi_networking.contact_num"] = $lang["networking"][4];
- $option["glpi_networking.date_mod"] = $lang["networking"][9];
- $option["glpi_networking_ports.ifaddr"] = $lang["networking"][14];
- $option["glpi_networking_ports.ifmac"] = $lang["networking"][15];
- $option["glpi_dropdown_netpoint.name"] = $lang["networking"][51];
- $option["glpi_enterprises.name"] = $lang["common"][5];
-
- echo "<form method='get' action=\"".$cfg_install["root"]."/networking/networking-search.php\">";
- echo "<div align='center'><table width='750' class='tab_cadre'>";
- echo "<tr><th colspan='3'><b>".$lang["search"][0].":</b></th></tr>";
- echo "<tr class='tab_bg_1'>";
-
- echo "<td align='center'>";
- echo "<input type='text' size='15' name=\"contains\" value=\"". $contains ."\" >";
- echo " ";
- echo $lang["search"][10]." ";
- echo "<select name=\"field\" size='1'>";
- echo "<option value='all' ";
- if($field == "all") echo "selected";
- echo ">".$lang["search"][7]."</option>";
- reset($option);
- foreach ($option as $key => $val) {
- echo "<option value=\"".$key."\"";
- if($key == $field) echo "selected";
- echo ">". $val ."</option>\n";
- }
- echo "</select> ";
- /*
- echo $lang["search"][1];
- echo " <select name='phrasetype' size='1' >";
- echo "<option value='contains'";
- if($phrasetype == "contains") echo "selected";
- echo ">".$lang["search"][2]."</option>";
- echo "<option value='exact'";
- if($phrasetype == "exact") echo "selected";
- echo ">".$lang["search"][3]."</option>";
- echo "</select>";
- */
-
- echo $lang["search"][4];
- echo " <select name='sort' size='1'>";
- reset($option);
- foreach ($option as $key => $val) {
- echo "<option value=\"".$key."\"";
- if($key == $sort) echo "selected";
- echo ">".$val."</option>\n";
- }
- echo "</select>";
- echo "</td><td><input type='checkbox' name='deleted' ".($deleted=='Y'?" checked ":"").">";
- echo "<img src=\"".$HTMLRel."pics/showdeleted.png\" alt='".$lang["common"][3]."' title='".$lang["common"][3]."'>";
- echo "</td><td width='80' align='center' class='tab_bg_2'>";
- echo "<input type='submit' value=\"".$lang["buttons"][0]."\" class='submit'>";
- echo "</td></tr></table></div></form>";
-}
-
-
-function showNetworkingList($target,$username,$field,$phrasetype,$contains,$sort,$order,$start,$deleted) {
-
- // Lists networking
-
- GLOBAL $cfg_install, $cfg_layout, $cfg_features, $lang, $HTMLRel;;
-
- $db = new DB;
-
- // Build query
- if($field=="all") {
- $where = " (";
- $fields = $db->list_fields("glpi_networking");
- $columns = $db->num_fields($fields);
-
- for ($i = 0; $i < $columns; $i++) {
- if($i != 0) {
- $where .= " OR ";
- }
- $coco = mysql_field_name($fields, $i);
-
- if($coco == "firmware") {
- $where .= " glpi_dropdown_firmware.name LIKE '%".$contains."%'";
- }
- elseif($coco == "location") {
- $where .= " glpi_dropdown_locations.name LIKE '%".$contains."%'";
- }
- elseif($coco == "type") {
- $where .= " glpi_type_networking.name LIKE '%".$contains."%'";
- }
- else {
- $where .= "glpi_networking.".$coco . " LIKE '%".$contains."%'";
- }
- }
- $where .= " OR glpi_networking_ports.ifaddr LIKE '%".$contains."%'";
- $where .= " OR glpi_networking_ports.ifmac LIKE '%".$contains."%'";
- $where .= " OR glpi_dropdown_netpoint.name LIKE '%".$contains."%'";
- $where.=" OR glpi_enterprises.name LIKE '%".$contains."%'";
- $where .= ")";
- }
- else {
- if ($phrasetype == "contains") {
- $where = "($field LIKE '%".$contains."%')";
- }
- else {
- $where = "($field LIKE '".$contains."')";
- }
- }
-
- if (!$start) {
- $start = 0;
- }
- if (!$order) {
- $order = "ASC";
- }
- $query = "select DISTINCT glpi_networking.ID from glpi_networking LEFT JOIN glpi_dropdown_locations on glpi_networking.location=glpi_dropdown_locations.ID ";
- $query .= "LEFT JOIN glpi_type_networking on glpi_networking.type = glpi_type_networking.ID ";
- $query .= "LEFT JOIN glpi_dropdown_firmware on glpi_networking.firmware = glpi_dropdown_firmware.ID ";
- $query .= "LEFT JOIN glpi_networking_ports on (glpi_networking.ID = glpi_networking_ports.on_device AND glpi_networking_ports.device_type='2')";
- $query .= "LEFT JOIN glpi_dropdown_netpoint on (glpi_dropdown_netpoint.ID = glpi_networking_ports.netpoint)";
- $query.= " LEFT JOIN glpi_enterprises ON (glpi_enterprises.ID = glpi_networking.FK_glpi_enterprise ) ";
- $query .= "where $where AND glpi_networking.deleted='$deleted' AND glpi_networking.is_template = '0' ORDER BY $sort $order";
-
- // Get it from database
- if ($result = $db->query($query)) {
- $numrows = $db->numrows($result);
-
- // Limit the result, if no limit applies, use prior result
- if ($numrows>$cfg_features["list_limit"]) {
- $query_limit = $query ." LIMIT $start,".$cfg_features["list_limit"]." ";
- $result_limit = $db->query($query_limit);
- $numrows_limit = $db->numrows($result_limit);
-
- } else {
- $numrows_limit = $numrows;
- $result_limit = $result;
- }
-
-
- if ($numrows_limit>0) {
- // Produce headline
- echo "<center><table class='tab_cadre'><tr>";
-
- // Name
- echo "<th>";
- if ($sort=="glpi_networking.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_networking.name&order=ASC&start=$start\">";
- echo $lang["networking"][0]."</a></th>";
-
- // Manufacturer
- echo "<th>";
- if ($sort=="glpi_enterprises.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_enterprises.name&order=ASC&start=$start\">";
- echo $lang["common"][5]."</a></th>";
-
- // Location
- echo "<th>";
- if ($sort=="glpi_dropdown_locations.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_dropdown_locations.name&order=ASC&start=$start\">";
- echo $lang["networking"][1]."</a></th>";
-
- // Type
- echo "<th>";
- if ($sort=="glpi_type_networking.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_type_networking.name&order=ASC&start=$start\">";
- echo $lang["networking"][2]."</a></th>";
-
-
- // Firmware
- echo "<th>";
- if ($sort=="glpi_dropdown_firmware.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_dropdown_firmware.name&order=ASC&start=$start\">";
- echo $lang["networking"][49]."</a></th>";
-
-
-
- // Last modified
- echo "<th>";
- if ($sort=="glpi_networking.date_mod") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_networking.date_mod&order=DESC&start=$start\">";
- echo $lang["networking"][9]."</a></th>";
-
- echo "</tr>";
-
- for ($i=0; $i < $numrows_limit; $i++) {
- $ID = $db->result($result_limit, $i, "ID");
- $networking = new Netdevice;
- $networking->getfromDB($ID);
- echo "<tr class='tab_bg_2'>";
- echo "<td><b>";
- echo "<a href=\"".$cfg_install["root"]."/networking/networking-info-form.php?ID=$ID\">";
- echo $networking->fields["name"]." (".$networking->fields["ID"].")";
- echo "</a></b></td>";
- echo "<td>". getDropdownName("glpi_enterprises",$networking->fields["FK_glpi_enterprise"]) ."</td>";
- echo "<td>". getDropdownName("glpi_dropdown_locations",$networking->fields["location"]) ."</td>";
- echo "<td>". getDropdownName("glpi_type_networking",$networking->fields["type"]) ."</td>";
- echo "<td>". getDropdownName("glpi_dropdown_firmware",$networking->fields["firmware"]) ."</td>";
- echo "<td>".$networking->fields["date_mod"]."</td>";
- echo "</tr>";
- }
-
- // Close Table
- echo "</table></center>";
-
- // Pager
- $parameters="field=$field&phrasetype=$phrasetype&contains=$contains&sort=$sort&order=$order";
- printPager($start,$numrows,$target,$parameters);
-
- } else {
- echo "<center><b>".$lang["networking"][38]."</b></center>";
- echo "<hr noshade>";
- }
- }
-}
-
-
-
-
-function showNetworkingForm ($target,$ID,$withtemplate='') {
- // Show device or blank form
-
- GLOBAL $cfg_layout,$cfg_install, $lang,$HTMLRel;
-
- $netdev = new Netdevice;
-
- $netdev_spotted = false;
-
- if(empty($ID) && $withtemplate == 1) {
- if($netdev->getEmpty()) $netdev_spotted = true;
- } else {
- if($netdev->getfromDB($ID)) $netdev_spotted = true;
- }
-
- if($netdev_spotted) {
- if(!empty($withtemplate) && $withtemplate == 2) {
- $template = "newcomp";
- $datestring = $lang["computers"][14].": ";
- $date = date("Y-m-d H:i:s");
- } elseif(!empty($withtemplate) && $withtemplate == 1) {
- $template = "newtemplate";
- $datestring = $lang["computers"][14].": ";
- $date = date("Y-m-d H:i:s");
- } else {
- $datestring = $lang["computers"][11]." : ";
- $date = $netdev->fields["date_mod"];
- $template = false;
- }
-
-
- echo "<div align='center'><form name='form' method='post' action=\"$target\">";
-
- if(strcmp($template,"newtemplate") === 0) {
- echo "<input type=\"hidden\" name=\"is_template\" value=\"1\" />";
- }
-
- echo "<table class='tab_cadre' cellpadding='2'>";
-
- echo "<tr><th align='center' >";
- if(!$template) {
- echo $lang["networking"][54].": ".$netdev->fields["ID"];
- }elseif (strcmp($template,"newcomp") === 0) {
- echo $lang["networking"][53].": ".$netdev->fields["tplname"];
- }elseif (strcmp($template,"newtemplate") === 0) {
- echo $lang["common"][6]." : <input type='text' name='tplname' value=\"".$netdev->fields["tplname"]."\" size='20'>";
- }
- echo "</th><th align='center'>".$datestring.$date;
- echo "</th></tr>";
-
-
- echo "<tr><td class='tab_bg_1' valign='top'>";
-
- echo "<table cellpadding='1px' cellspacing='0' border='0'>\n";
-
- echo "<tr><td>".$lang["networking"][0].": </td>";
- echo "<td><input type='text' name='name' value=\"".$netdev->fields["name"]."\" size='20'></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["networking"][1].": </td><td>";
- dropdownValue("glpi_dropdown_locations", "location", $netdev->fields["location"]);
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_1'><td>".$lang["common"][5].": </td><td colspan='2'>";
- dropdownValue("glpi_enterprises","FK_glpi_enterprise",$netdev->fields["FK_glpi_enterprise"]);
- echo "</td></tr>";
-
- echo "<tr><td>".$lang["networking"][4].": </td>";
- echo "<td><input type='text' name='contact_num' value=\"".$netdev->fields["contact_num"]."\" size='20'></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["networking"][3].": </td>";
- echo "<td><input type='text' name='contact' size='20' value=\"".$netdev->fields["contact"]."\"></td>";
- echo "</tr>";
-
-//<<<<<<< functions.php
- echo "<tr><td>".$lang["networking"][55].": </td><td>";
- dropdownValue("glpi_contacts", "tech_num", $netdev->fields["tech_num"]);
- echo "</td></tr>";
-
-
- //if (!empty($ID)){
-//=======
- if (!$template){
-//>>>>>>> 1.87
- echo "<tr><td>".$lang["reservation"][24].":</td><td><b>";
- showReservationForm(NETWORKING_TYPE,$ID);
- echo "</b></td></tr>";
- }
- echo "</table>";
-
- echo "</td>\n";
- echo "<td class='tab_bg_1' valign='top'>";
-
- echo "<table cellpadding='1px' cellspacing='0' border='0'";
-
- echo "<tr><td>".$lang["networking"][2].": </td><td>";
- dropdownValue("glpi_type_networking", "type", $netdev->fields["type"]);
- echo "</td></tr>";
-
- echo "<tr><td>".$lang["networking"][49].": </td><td>";
- dropdownValue("glpi_dropdown_firmware", "firmware", $netdev->fields["firmware"]);
- echo "</td></tr>";
-
- echo "<tr><td>".$lang["networking"][5].": </td>";
- echo "<td><input type='text' name='ram' value=\"".$netdev->fields["ram"]."\" size='10'></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["networking"][6].": </td>";
- echo "<td><input type='text' name='serial' size='20' value=\"".$netdev->fields["serial"]."\"></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["networking"][7].":</td>";
- echo "<td><input type='text' size='20' name='otherserial' value=\"".$netdev->fields["otherserial"]."\"></td>";
- echo "</tr>";
- echo "</table>";
-
- echo "</td>\n";
- echo "</tr>";
- echo "<tr>";
- echo "<td class='tab_bg_1' valign='top' colspan='2'>";
-
- echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'><tr><td valign='top'>";
- echo $lang["networking"][8].": </td>";
- echo "<td align='center'><textarea cols='35' rows='4' name='comments' >".$netdev->fields["comments"]."</textarea>";
- echo "</td></tr></table>";
-
- echo "</td>";
- echo "</tr>";
-
- echo "<tr>";
-
- if ($template) {
-
- if (empty($ID)||$withtemplate==2){
- echo "<td class='tab_bg_2' align='center' colspan='2'>\n";
- echo "<input type='hidden' name='ID' value=$ID>";
- echo "<input type='submit' name='add' value=\"".$lang["buttons"][8]."\" class='submit'>";
- echo "</td>\n";
- } else {
- echo "<td class='tab_bg_2' align='center' colspan='2'>\n";
- echo "<input type='hidden' name='ID' value=$ID>";
- echo "<input type='submit' name='update' value=\"".$lang["buttons"][7]."\" class='submit'>";
- echo "</td>\n";
- }
-
- } else {
-
- echo "<td class='tab_bg_2' valign='top'>";
- echo "<input type='hidden' name='ID' value=\"$ID\">\n";
- echo "<div align='center'><input type='submit' name='update' value=\"".$lang["buttons"][7]."\" class='submit'></div>";
- echo "</td></form>\n\n";
- echo "<form action=\"$target\" method='post'>\n";
- echo "<td class='tab_bg_2' valign='top'>\n";
- echo "<input type='hidden' name='ID' value=\"$ID\">\n";
- echo "<div align='center'>";
- if ($netdev->fields["deleted"]=='N')
- echo "<input type='submit' name='delete' value=\"".$lang["buttons"][6]."\" class='submit'>";
- else {
- echo "<input type='submit' name='restore' value=\"".$lang["buttons"][21]."\" class='submit'>";
-
- echo " <input type='submit' name='purge' value=\"".$lang["buttons"][22]."\" class='submit'>";
- }
- echo "</div>";
- echo "</td>";
- }
- echo "</form></tr>";
-
- echo "</table></div>";
-
- return true;
- }
- else {
- echo "<div align='center'><b>".$lang["networking"][38]."</b></div>";
- echo "<hr noshade>";
- searchFormNetworking();
- return false;
- }
-
-}
-
-function addNetdevice($input) {
- // Add Netdevice, nasty hack until we get PHP4-array-functions
- $db=new DB;
- $netdev = new Netdevice;
-
- // dump the status
- $oldID=$input["ID"];
-
- $null = array_pop($input);
- $null = array_pop($input);
- // set new date.
- $netdev->fields["date_mod"] = date("Y-m-d H:i:s");
-
- // fill array for update
- foreach ($input as $key => $val) {
- if (empty($netdev->fields[$key]) || $netdev->fields[$key] != $input[$key]) {
- $netdev->fields[$key] = $input[$key];
- }
- }
-
- $netdev->addToDB();
- $newID=$netdev->getInsertElementID();
-
- // ADD Infocoms
- $ic= new Infocom();
- if ($ic->getFromDB(NETWORKING_TYPE,$oldID)){
- $ic->fields["FK_device"]=$newID;
- unset ($ic->fields["ID"]);
- $ic->addToDB();
- }
-
- // ADD Ports
- $query="SELECT ID from glpi_networking_ports WHERE on_device='$oldID' AND device_type='".NETWORKING_TYPE."';";
- $result=$db->query($query);
- if ($db->numrows($result)>0){
-
- while ($data=$db->fetch_array($result)){
- $np= new Netport();
- $np->getFromDB($data["ID"]);
- unset($np->fields["ID"]);
- unset($np->fields["ifaddr"]);
- unset($np->fields["ifmac"]);
- unset($np->fields["netpoint"]);
- $np->fields["on_device"]=$newID;
- $np->addToDB();
- }
- }
-
- // ADD Contract
- $query="SELECT FK_contract from glpi_contract_device WHERE FK_device='$oldID' AND device_type='".NETWORKING_TYPE."';";
- $result=$db->query($query);
- if ($db->numrows($result)>0){
-
- while ($data=$db->fetch_array($result))
- addDeviceContract($data["FK_contract"],NETWORKING_TYPE,$newID);
- }
-
-
-}
-
-function updateNetdevice($input) {
- // Update a netdevice in the database
-
- $netdev = new Netdevice;
- $netdev->getFromDB($input["ID"]);
-
- // set new date and make sure it gets updated
- $updates[0]= "date_mod";
- $netdev->fields["date_mod"] = date("Y-m-d H:i:s");
-
- // Pop off the last two attributes, no longer needed
- $null=array_pop($input);
- $null=array_pop($input);
-
- // Get all flags and fill with 0 if unchecked in form
- foreach ($netdev->fields as $key => $val) {
- if (eregi("\.*flag\.*",$key)) {
- if (!$input[$key]) {
- $input[$key]=0;
- }
- }
- }
-
- // Fill the update-array with changes
- $x=1;
- foreach ($input as $key => $val) {
- if ($netdev->fields[$key] != $input[$key]) {
- $netdev->fields[$key] = $input[$key];
- $updates[$x] = $key;
- $x++;
- }
- }
-
- $netdev->updateInDB($updates);
-
-}
-
-function deleteNetdevice($input,$force=0) {
- // Delete Netdevice
-
- $netdev = new Netdevice;
- $netdev->deleteFromDB($input["ID"],$force);
-}
-
-function restoreNetdevice($input) {
- // Restore Netdevice
-
- $ct = new Netdevice;
- $ct->restoreInDB($input["ID"]);
-}
-
-
-
-///// Manage Ports on Devices /////
-
-function showPorts ($device,$device_type,$withtemplate='') {
-
- GLOBAL $cfg_layout,$cfg_install, $lang;
-
- $db = new DB;
- switch($device_type) {
- case COMPUTER_TYPE :
- $device_real_table_name = "glpi_computers";
- break;
- case NETWORKING_TYPE :
- $device_real_table_name = "glpi_networking";
- break;
- case PRINTER_TYPE :
- $device_real_table_name = "glpi_printers";
- break;
- }
- $query = "SELECT location from ".$device_real_table_name." where ID = ".$device."";
- $location = $db->result($db->query($query),0,"location");
-
- $query = "SELECT ID FROM glpi_networking_ports WHERE (on_device = $device AND device_type = $device_type) ORDER BY logical_number";
- if ($result = $db->query($query)) {
- if ($db->numrows($result)!=0) {
- echo "<br><div align='center'><table class='tab_cadre' width='90%'>";
- echo "<tr><th colspan='7'>";
- echo $db->numrows($result)." ";
- if ($db->numrows($result)<2) {
- echo $lang["networking"][37];
- } else {
- echo $lang["networking"][13];
- }
- echo ":</th></tr>";
- echo "<tr><th>#</th><th>".$lang["networking"][0]."</th><th>".$lang["networking"][51]."</th>";
- echo "<th>".$lang["networking"][14]."</th><th>".$lang["networking"][15]."</th>";
- echo "<th>".$lang["networking"][16]."</th><th>".$lang["networking"][17].":</th></tr>\n";
- $i=0;
- while ($devid=$db->fetch_row($result)) {
- $netport = new Netport;
- $netport->getfromDB(current($devid));
- echo "<tr class='tab_bg_1'>";
- echo "<td align='center'><b>";
- if ($withtemplate!=2) echo "<a href=\"".$cfg_install["root"]."/networking/networking-port.php?ID=".$netport->fields["ID"]."&location=".$location."\">";
- echo $netport->fields["logical_number"];
- if ($withtemplate!=2) echo "</a>";
- echo "</b></td>";
- echo "<td>".$netport->fields["name"]."</td>";
- echo "<td>".getDropdownName("glpi_dropdown_netpoint",$netport->fields["netpoint"])."</td>";
- echo "<td>".$netport->fields["ifaddr"]."</td>";
- echo "<td>".$netport->fields["ifmac"]."</td>";
- echo "<td>".getDropdownName("glpi_dropdown_iface",$netport->fields["iface"])."</td>";
- echo "<td>";
- showConnection($netport->fields["ID"],$withtemplate);
- echo "</td>";
- echo "</tr>";
- }
- echo "</table></div>\n\n";
- }
- }
-}
-
-
-
-function showNetportForm($target,$ID,$ondevice,$devtype,$several,$search = '', $location = '') {
-
- GLOBAL $cfg_install, $cfg_layout, $lang, $REFERER;
-
- $netport = new Netport;
- if($ID)
- {
- $netport->getFromDB($ID);
- $netport->getDeviceData($netport->fields["on_device"],$netport->fields["device_type"]);
- }
- else
- {
- $netport->getFromNull();
- }
-
- // Ajout des infos déjà remplies
- if (isset($_POST)&&!empty($_POST)){
- foreach ($netport->fields as $key => $val)
- if ($key!='ID'&&isset($_POST[$key]))
- $netport->fields[$key]=$_POST[$key];
- }
-
-
- echo "<div align='center'>";
- echo "<b><a href='$REFERER'>".$lang["buttons"][13]."</a></b>";
- echo "<table class='tab_cadre'><tr>";
-
- echo "<th colspan='4'>".$lang["networking"][20].":</th>";
- echo "</tr>";
- echo "<form method='post' action=\"$target\">";
- echo "<input type='hidden' name='referer' value='$REFERER'>";
-
- if ($several!="yes"){
- echo "<tr class='tab_bg_1'><td>".$lang["networking"][21].":</td>";
- echo "<td><input type='text' size='5' name='logical_number' value=\"".$netport->fields["logical_number"]."\">";
- echo "</td></tr>";
- }
- else {
- echo "<tr class='tab_bg_1'><td>".$lang["networking"][21].":</td>";
- echo "<input type='hidden' name='several' value='yes'>";
- echo "<input type='hidden' name='logical_number' value=''>";
- echo "<td>";
- echo $lang["networking"][47].":<select name='from_logical_number'>";
- for ($i=0;$i<100;$i++)
- echo "<option value='$i'>$i</option>";
- echo "</select>";
- echo $lang["networking"][48].":<select name='to_logical_number'>";
- for ($i=0;$i<100;$i++)
- echo "<option value='$i'>$i</option>";
- echo "</select>";
-
- echo "</td></tr>";
- }
-
- echo "<tr class='tab_bg_1'><td>".$lang["networking"][0]."</td>";
- echo "<td><input type='text' size='20' name='name' value=\"".$netport->fields["name"]."\">";
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_1'><td>".$lang["networking"][16]."</td><td>";
- dropdownValue("glpi_dropdown_iface","iface", $netport->fields["iface"]);
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_1'><td>".$lang["networking"][22]."</td>";
- echo "<td><input type='text' size='20' name='ifaddr' value=\"".$netport->fields["ifaddr"]."\">";
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_1'><td>".$lang["networking"][23]."</td>";
- echo "<td><input type='text' size='25' name='ifmac' value=\"".$netport->fields["ifmac"]."\">";
- echo "</td></tr>";
-
- if ($several!="yes"){
- echo "<tr class='tab_bg_1'><td>".$lang["networking"][51].":</td>";
-
- echo "<td align='center' >";
- NetpointLocationSearch($search,"netpoint",$location,$netport->fields["netpoint"]);
- echo "<input type='text' size='10' name='search'>";
- echo "<input type='submit' value=\"".$lang["buttons"][0]."\" name='Modif_Interne' class='submit'>";
- echo "</td></tr>";
- }
- if ($ID) {
- echo "<tr class='tab_bg_1'><td>".$lang["networking"][24]."</td>";
- echo "<td>";
- showConnection($netport->fields["ID"]);
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_2'>";
- echo "<td align='center'>";
- echo "<input type='hidden' name='ID' value=".$netport->fields["ID"].">";
- echo "<input type='submit' name='update' value=\"".$lang["buttons"][7]."\" class='submit'>";
- echo "</td></form>";
-
- echo "<form method='post' action=$target>";
- echo "<input type='hidden' name='ID' value=$ID>";
- echo "<td align='center'>";
- echo "<input type='submit' name='delete' value=\"".$lang["buttons"][6]."\" class='submit'>";
- echo "</td></tr></form>";
- } else
- {
-
- echo "<tr class='tab_bg_2'>";
- echo "<td align='center' colspan='2'>";
- echo "<input type='hidden' name='on_device' value='$ondevice'>";
- echo "<input type='hidden' name='device_type' value='$devtype'>";
- echo "<input type='submit' name='add' value=\"".$lang["buttons"][8]."\" class='submit'>";
- echo "</td></form>";
- }
-
- echo "</table>";
-}
-
-function addNetport($input) {
- // Add Netport, nasty hack until we get PHP4-array-functions
-
- $netport = new Netport;
-
- // dump status
- unset($input['search']);
- $null = array_pop($input);
-
- // fill array for update
- foreach ($input as $key => $val) {
- if (!isset($netport->fields[$key]) || $netport->fields[$key] != $input[$key]) {
- $netport->fields[$key] = $input[$key];
- }
- }
-
- if ($netport->addToDB()) {
- return true;
- } else {
- return false;
- }
-}
-
-function updateNetport($input) {
- // Update a port
-
- $netport = new Netport;
- $netport->getFromDB($input["ID"]);
-
- // Pop off the last two attributes, no longer needed
- unset($input['referer']);
- unset($input['search']);
- $null=array_pop($input);
- // Fill the update-array with changes
- $x=0;
- $updates=array();
- foreach ($input as $key => $val) {
- if ($netport->fields[$key] != $input[$key]) {
- $netport->fields[$key] = $input[$key];
- $updates[$x] = $key;
- $x++;
- }
- }
- $netport->updateInDB($updates);
-}
-
-function deleteNetport($input) {
-
- // Delete Netwire
- removeConnector($input["ID"]);
-
- // Delete Netport
- $netport = new Netport;
- $netport->deleteFromDB($input["ID"]);
-
-
-
-}
-
-function showPortsAdd($ID,$devtype) {
-
- GLOBAL $cfg_layout, $cfg_install, $lang;
- $db = new DB;
- switch($devtype) {
- case COMPUTER_TYPE :
- $device_real_table_name = "glpi_computers";
- break;
- case NETWORKING_TYPE :
- $device_real_table_name = "glpi_networking";
- break;
- case PRINTER_TYPE :
- $device_real_table_name = "glpi_printers";
- break;
- }
- $query = "SELECT location from ".$device_real_table_name." where ID = ".$ID."";
- $location = $db->result($db->query($query),0,"location");
-
- echo "<div align='center'><table class='tab_cadre' width='90%' cellpadding='2'>";
- echo "<tr>";
- echo "<td align='center' class='tab_bg_2' >";
- echo "<a href=\"".$cfg_install["root"]."/networking/networking-port.php?on_device=$ID&device_type=$devtype&location=$location\"><b>";
- echo $lang["networking"][19];
- echo "</b></a></td>";
- echo "<td align='center' class='tab_bg_2' width='50%'>";
- echo "<a href=\"".$cfg_install["root"]."/networking/networking-port.php?ondevice=$ID&devtype=$devtype&several=yes&location=$location\"><b>";
- echo $lang["networking"][46];
- echo "</b></a></td>";
-
- echo "</tr>";
- echo "</table></div><br>";
-}
-
-function showConnection ($ID,$withtemplate='') {
-
- GLOBAL $cfg_layout, $cfg_install, $lang;
-
- $contact = new Netport;
- if ($contact->getContact($ID)) {
- $netport = new Netport;
- $netport->getfromDB($contact->contact_id);
- $netport->getDeviceData($netport->fields["on_device"],$netport->fields["device_type"]);
- echo "\n\n<table border='0' cellspacing='0' width='100%'><tr ".($netport->deleted=='Y'?"class='tab_bg_2_2'":"").">";
- echo "<td><b>";
- echo "<a href=\"".$cfg_install["root"]."/networking/networking-port.php?ID=".$netport->fields["ID"]."\">";
- if (rtrim($netport->fields["name"])!="")
- echo $netport->fields["name"];
- else echo $lang["common"][0];
- echo "</a></b>";
- echo " ".$lang["networking"][25]." <b>";
- if ($netport->fields["device_type"]==1) {
- echo "<a href=\"".$cfg_install["root"]."/computers/computers-info-form.php?ID=".$netport->device_ID."\">";
- } else if ($netport->fields["device_type"]==2) {
- echo "<a href=\"".$cfg_install["root"]."/networking/networking-info-form.php?ID=".$netport->device_ID."\">";
- } else if ($netport->fields["device_type"]==3) {
- echo "<a href=\"".$cfg_install["root"]."/printers/printers-info-form.php?ID=".$netport->device_ID."\">";
- }
- echo $netport->device_name." (".$netport->device_ID.")";
- echo "</a>";
- echo "</b></td>";
- echo "<td align='right'><b>";
- if ($withtemplate!=2)
- echo "<a href=\"".$cfg_install["root"]."/networking/networking-port-disconnect.php?ID=$ID\">".$lang["buttons"][10]."</a>";
- else " ";
- echo "</b></td>";
- echo "</tr></table>";
-
- } else {
- echo "<table border='0' cellspacing='0' width='100%'><tr>";
- echo "<td>".$lang["networking"][26]."</td>";
- echo "<td align='right'><b>";
- if ($withtemplate!=2&&$withtemplate!=1)
- echo "<a href=\"".$cfg_install["root"]."/networking/networking-port-connect.php?ID=$ID\">".$lang["buttons"][9]."</a>";
- else echo " ";
- echo "</b></td>";
- echo "</tr></table>";
- }
-}
-
-
-///// Wire the Ports /////
-
-
-function showConnectorSearch($target,$ID) {
-
- GLOBAL $cfg_layout,$cfg_install, $lang;
-
-
- echo "<div align='center'><form method='post' action=\"$target\"><table border='0' class='tab_cadre'>";
- echo "<tr><th colspan='2'>".$lang["networking"][27]." $ID ".$lang["networking"][28].":</th></tr>";
-
- echo "<tr class='tab_bg_1'>";
-
- echo "<td>".$lang["networking"][29]." <select name=type>";
- echo "<option value='name'>".$lang["networking"][0]."</option>";
- echo "<option value='id'>ID</option>";
- echo "</select>";
- echo $lang["networking"][30]." <input type='text' size='10' name='comp'>";
- echo "<input type='hidden' name='pID1' value=$ID>";
- echo "<input type='hidden' name='next' value=\"compsearch\">";
- echo "</td><td class='tab_bg_2'>";
- echo "<input type='submit' value=\"".$lang["buttons"][11]."\" class='submit'>";
- echo "</td></tr>";
- echo "</form>";
-
- echo "<tr class='tab_bg_1'>";
- echo "<form method='post' action=\"$target\">";
- echo "<td>".$lang["networking"][31].":";
- $db = new DB;
- $query = "SELECT glpi_networking.ID AS ID, glpi_networking.name AS name, glpi_dropdown_locations.ID as location from glpi_networking LEFT JOIN glpi_dropdown_locations ON glpi_networking.location = glpi_dropdown_locations.id";
- $result = $db->query($query);
- $number = $db->numrows($result);
- echo "<select name='dID'>";
- $i=0;
- while ($i < $number)
- {
- $dID = $db->result($result, $i, "ID");
- $name = $db->result($result, $i, "name");
- $location = $db->result($result, $i, "location");
- echo "<option value=$dID>$name (".getTreeValueName("glpi_dropdown_locations",$location).")</option>";
- $i++;
- }
- echo "</select>";
- echo "<input type='hidden' name='pID1' value=$ID>";
- echo "<input type='hidden' name='next' value=\"showports\">";
- echo "<input type='hidden' name='device_type' value='2'>";
- echo "</td><td class='tab_bg_2'>";
- echo "<input type='submit' value=\"".$lang["buttons"][11]."\" class='submit'>";
- echo "</td></tr>";
- echo "</table>";
- echo "</form>";
-}
-
-function listConnectorComputers($target,$input) {
-
- GLOBAL $cfg_layout,$cfg_install, $lang;
-
- $pID1 = $input["pID1"];
-
- echo "<div align='center'><form method='post' action=\"$target\"><table border='0' class='tab_cadre'>";
- echo "<tr><th colspan='2'>".$lang["networking"][27]." $pID1 ".$lang["networking"][32].". ".$lang["networking"][33].":</th></tr>";
- echo "<tr><td>";
-
- echo "<tr class='tab_bg_1'>";
- echo "<td align='center'>";
-
- $db = new DB;
- if ($input["type"] == "name") {
- $query = "SELECT glpi_computers.ID as ID, glpi_computers.name as name, glpi_dropdown_locations.ID as location from glpi_computers, glpi_dropdown_locations WHERE glpi_computers.location = glpi_dropdown_locations.id AND glpi_computers.name LIKE '%".$input["comp"]."%'";
- } else {
- $query = "SELECT glpi_computers.ID as ID, glpi_computers.name as name, glpi_dropdown_locations.ID as location from glpi_computers, glpi_dropdown_locations WHERE glpi_computers.location = glpi_dropdown_locations.id AND glpi_computers.ID LIKE '%".$input["comp"]."%'";
- }
-//echo $query;
- $query.= " ORDER BY glpi_computers.name";
- $result = $db->query($query);
- $number = $db->numrows($result);
- echo "<select name='dID'>";
- $i=0;
- while ($i < $number)
- {
- $dID = $db->result($result, $i, "ID");
- $name = $db->result($result, $i, "name");
- $location = $db->result($result, $i, "location");
- echo "<option value=$dID>$dID - $name (".getTreeValueName("glpi_dropdown_locations",$location).")</option>";
- $i++;
- }
- echo "</select>";
-
- echo "</td>";
- echo "<td class='tab_bg_2' align='center'>";
- echo "<input type='hidden' name='device_type' value='1'>";
- echo "<input type='hidden' name='pID1' value=\"".$pID1."\">";
- echo "<input type='hidden' name='next' value=\"showports\">";
- echo "<input type='submit' value=\"".$lang["buttons"][11]."\">";
- echo "</td></tr></table></form>";
-
-}
-
-function listConnectorPorts($target,$input) {
-
- GLOBAL $cfg_layout,$cfg_install,$lang;
-
- $pID1 = $input["pID1"];
-
- $db = new DB;
- $query = "SELECT * FROM glpi_networking_ports WHERE (on_device = ".$input["dID"]." AND device_type = ".$input["device_type"].") ORDER BY logical_number";
- $result = $db->query($query);
- $number = $db->numrows($result);
-
- if ($number < 1) {
- echo "<div align='center'><b>".$lang["networking"][34]."</b></div>";
- } else {
-
- echo "<div align='center'><table border='0' cellspacing=2 width='90%' class='tab_cadre'>";
- echo "<tr><th>".$lang["networking"][27]." $pID1 ".$lang["networking"][35].". ".$lang["networking"][36]." ".$input["dID"].":</th></tr>";
- echo "</table></div>";
-
- echo "\n\n<br><div align='center'><table border='0' cellpadding='2' width='90%' class='tab_cadre'>";
- echo "<tr><th>#</th><th>".$lang["networking"][0]."</th><th>".$lang["networking"][51]."</th>";
- echo "<th>".$lang["networking"][14]."</th><th>".$lang["networking"][15]."</th>";
- echo "<th>".$lang["networking"][16]."</th><th>".$lang["networking"][17].":</th></tr>\n";
-
- while ($data = $db->fetch_array($result)) {
- $pID2 = $data["ID"];
-
- $contact = new Netport;
-
- echo "<tr class='tab_bg_1'>";
- echo "<td>".$data["logical_number"]."</td>";
- echo "<td>";
- echo "<a href=\"".$cfg_install["root"]."/networking/networking-port.php?ID=".$data["ID"]."\">";
- echo $data["name"];
- echo "</a>";
- echo "</td>";
- echo "<td>".getDropdownName("glpi_dropdown_netpoint",$data["netpoint"])."</td>";
- echo "<td>".$data["ifaddr"]."</td>";
- echo "<td>".$data["ifmac"]."</td>";
- echo "<td>".getDropdownName("glpi_dropdown_iface",$data["iface"])."</td>";
- echo "<td>";
-
- if ($contact->getContact($pID2)) {
- $netport = new Netport;
- $netport->getfromDB($contact->contact_id);
- $netport->getDeviceData($netport->fields["on_device"],$netport->fields["device_type"]);
- echo "\n\n<table border='0' cellspacing='0' width='100%'><tr>";
- echo "<td>";
- echo "<a href=\"".$cfg_install["root"]."/networking/networking-port.php?ID=".$netport->fields["ID"]."\">";
- echo $netport->fields["name"];
- echo "</a> ";
- echo $lang["networking"][25];
- echo " <a href=\"".$cfg_install["root"]."/computers/computers-info-form.php?ID=".$netport->device_ID."\">";
- echo $netport->device_name." (".$netport->device_ID.")";
- echo "</a>";
- echo "</td>";
- echo "<td align='right'><b>";
- echo "<a href=\"".$cfg_install["root"]."/networking/networking-port-disconnect.php?ID=".$netport->fields["ID"];
- if (!empty($pID1)) echo "&sport=$pID1";
- echo "\">".$lang["buttons"][10]."</a>";
- echo "</b></td>";
- echo "</tr></table>";
-
- } else {
- echo "<table border='0' cellspacing='0' width='100%'><tr>";
- echo "<td>".$lang["networking"][26]."</td>";
- echo "<td align='right'><b>";
- echo "<a href=\"$target?next=connect&sport=$pID1&dport=$pID2\">".$lang["buttons"][9]."</a>";
- echo "</b></td>";
- echo "</tr></table>";
- }
-
- echo "</td>";
- echo "</tr>";
- }
- echo "</table>";
- }
-}
-
-function makeConnector($sport,$dport) {
-
- GLOBAL $cfg_layout, $cfg_install, $lang;
-
- $db = new DB;
- // Get netpoint for $sport and $dport
- $ps=new Netport;
- $ps->getFromDB($sport);
- $nps="";
- $ips="";
- $macs="";
- if (isset($ps->fields["netpoint"]))
- $nps=$ps->fields["netpoint"];
- if (isset($ps->fields["ifaddr"]))
- $ips=$ps->fields["ifaddr"];
- if (isset($ps->fields["ifmac"]))
- $macs=$ps->fields["ifmac"];
-
- $pd=new Netport;
- $pd->getFromDB($dport);
- $npd="";
- $ipd="";
- $macd="";
- if (isset($pd->fields["netpoint"]))
- $npd=$pd->fields["netpoint"];
- if (isset($pd->fields["ifaddr"]))
- $ipd=$pd->fields["ifaddr"];
- if (isset($pd->fields["ifmac"]))
- $macd=$pd->fields["ifmac"];
-
- // Update unknown IP
- $updates[0]="ifaddr";
- if (empty($ips)&&!empty($ipd)){
- $ps->fields["ifaddr"]=$ipd;
- $ps->updateInDB($updates);
- echo "<div align='center'><b>".$lang["connect"][19]."</b></div>";
- }
- else if (!empty($ips)&&empty($ipd)){
- $pd->fields["ifaddr"]=$ips;
- $pd->updateInDB($updates);
- echo "<div align='center'><b>".$lang["connect"][19]."</b></div>";
- }
- else if ($ips!=$ipd){
- echo "<div align='center'><b>".$lang["connect"][20]."</b></div>";
- }
- // Update unknown MAC
- $updates[0]="ifmac";
- if (empty($macs)&&!empty($macd)){
- $ps->fields["ifmac"]=$macd;
- $ps->updateInDB($updates);
- echo "<div align='center'><b>".$lang["connect"][21]."</b></div>";
- }
- else if (!empty($macs)&&empty($macd)){
- $pd->fields["ifmac"]=$macs;
- $pd->updateInDB($updates);
- echo "<div align='center'><b>".$lang["connect"][21]."</b></div>";
- }
- else if ($macs!=$macd){
- echo "<div align='center'><b>".$lang["connect"][22]."</b></div>";
- }
- // Update unknown netpoint
- $updates[0]="netpoint";
- if (empty($nps)&&!empty($npd)){
- $ps->fields["netpoint"]=$npd;
- $ps->updateInDB($updates);
- echo "<div align='center'><b>".$lang["connect"][17]."</b></div>";
- }
- else if (!empty($nps)&&empty($npd)){
- $pd->fields["netpoint"]=$nps;
- $pd->updateInDB($updates);
- echo "<div align='center'><b>".$lang["connect"][17]."</b></div>";
- }
- else if ($nps!=$npd){
- echo "<div align='center'><b>".$lang["connect"][18]."</b></div>";
- }
-
- $query = "INSERT INTO glpi_networking_wire VALUES (NULL,$sport,$dport)";
- if ($result = $db->query($query)) {
-
- echo "<br><div align='center'><b>".$lang["networking"][44]." ".$ps->fields['logical_number']." (".$ps->fields['ifaddr']." - ".$ps->fields['ifmac'].") ".$lang["networking"][45]." ".$ps->fields['logical_number']." (".$pd->fields['ifaddr']." - ".$pd->fields['ifmac'].") </b></div>";
- return true;
- } else {
- return false;
- }
-
-}
-
-function removeConnector($ID) {
-
- GLOBAL $cfg_layout, $cfg_install;
-
- // Update to blank networking item
- $nw=new Netwire;
- if ($ID2=$nw->getOppositeContact($ID)){
-
- $np1=new Netport;
- $np2=new Netport;
- $np1->getFromDB($ID);
- $np2->getFromDB($ID2);
- $npup=-1;
- if ($np1->fields["device_type"]==2&&$np2->fields["device_type"]!=2){
- $npup=$ID;
- }
- if ($np2->fields["device_type"]==2&&$np1->fields["device_type"]!=2){
- $npup=$ID2;
- }
- $db = new DB;
- if ($npup!=-1){
- $query = "UPDATE glpi_networking_ports SET netpoint=NULL, ifaddr='', ifmac='' WHERE ID='$npup'";
- $db->query($query);
- }
-
- $query = "DELETE FROM glpi_networking_wire WHERE (end1 = '$ID' OR end2 = '$ID')";
- if ($result=$db->query($query)) {
- return true;
- } else {
- return false;
- }
- } else return false;
-}
-
-
-?>
diff -Nur web/glpi/glpi/glpi/networking/.#functions.php.1.80 glpi/glpi/networking/.#functions.php.1.80
--- web/glpi/glpi/glpi/networking/.#functions.php.1.80 2005-03-04 12:27:16.000000000 +0100
+++ glpi/glpi/networking/.#functions.php.1.80 1970-01-01 01:00:00.000000000 +0100
@@ -1,1107 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
- ----------------------------------------------------------------------
-*/
-
-// Based on:
-// IRMA, Information Resource-Management and Administration
-// Christian Bauer
-// ----------------------------------------------------------------------
-// Original Author of file:
-// Purpose of file:
-// ----------------------------------------------------------------------
-
-include ("_relpos.php");
-///// Manage Netdevices /////
-
-function titleNetdevices() {
- // titre
-
- GLOBAL $lang,$HTMLRel;
-
- echo "<div align='center'><table border='0'><tr><td>";
- echo "<img src=\"".$HTMLRel."pics/networking.png\" alt='".$lang["networking"][11]."' title='".$lang["networking"][11]."'></td><td><a class='icon_consol' href=\"networking-info-form.php\"><b>".$lang["networking"][11]."</b></a>";
- echo "</td></tr></table></div>";
-
-}
-
-function searchFormNetworking($field="",$phrasetype= "",$contains="",$sort= "",$deleted= "") {
- // Netwokirng Search Form
-
- GLOBAL $cfg_install, $cfg_layout, $layout, $lang,$HTMLRel;
-
- $option["glpi_networking.name"] = $lang["networking"][0];
- $option["glpi_networking.ID"] = $lang["networking"][50];
- $option["glpi_dropdown_locations.name"] = $lang["networking"][1];
- $option["glpi_type_networking.name"] = $lang["networking"][2];
- $option["glpi_networking.serial"] = $lang["networking"][6];
- $option["glpi_networking.otherserial"] = $lang["networking"][7] ;
- $option["glpi_dropdown_firmware.name"] = $lang["networking"][49] ;
- $option["glpi_networking.comments"] = $lang["networking"][8];
- $option["glpi_networking.contact"] = $lang["networking"][3];
- $option["glpi_networking.contact_num"] = $lang["networking"][4];
- $option["glpi_networking.date_mod"] = $lang["networking"][9];
- $option["glpi_networking_ports.ifaddr"] = $lang["networking"][14];
- $option["glpi_networking_ports.ifmac"] = $lang["networking"][15];
- $option["glpi_dropdown_netpoint.name"] = $lang["networking"][51];
- $option["glpi_enterprises.name"] = $lang["common"][5];
-
- echo "<form method='get' action=\"".$cfg_install["root"]."/networking/networking-search.php\">";
- echo "<div align='center'><table width='750' class='tab_cadre'>";
- echo "<tr><th colspan='3'><b>".$lang["search"][0].":</b></th></tr>";
- echo "<tr class='tab_bg_1'>";
-
- echo "<td align='center'>";
- echo "<input type='text' size='15' name=\"contains\" value=\"". $contains ."\" >";
- echo " ";
- echo $lang["search"][10]." ";
- echo "<select name=\"field\" size='1'>";
- echo "<option value='all' ";
- if($field == "all") echo "selected";
- echo ">".$lang["search"][7]."</option>";
- reset($option);
- foreach ($option as $key => $val) {
- echo "<option value=\"".$key."\"";
- if($key == $field) echo "selected";
- echo ">". $val ."</option>\n";
- }
- echo "</select> ";
- /*
- echo $lang["search"][1];
- echo " <select name='phrasetype' size='1' >";
- echo "<option value='contains'";
- if($phrasetype == "contains") echo "selected";
- echo ">".$lang["search"][2]."</option>";
- echo "<option value='exact'";
- if($phrasetype == "exact") echo "selected";
- echo ">".$lang["search"][3]."</option>";
- echo "</select>";
- */
-
- echo $lang["search"][4];
- echo " <select name='sort' size='1'>";
- reset($option);
- foreach ($option as $key => $val) {
- echo "<option value=\"".$key."\"";
- if($key == $sort) echo "selected";
- echo ">".$val."</option>\n";
- }
- echo "</select>";
- echo "</td><td><input type='checkbox' name='deleted' ".($deleted=='Y'?" checked ":"").">";
- echo "<img src=\"".$HTMLRel."pics/showdeleted.png\" alt='".$lang["common"][3]."' title='".$lang["common"][3]."'>";
- echo "</td><td width='80' align='center' class='tab_bg_2'>";
- echo "<input type='submit' value=\"".$lang["buttons"][0]."\" class='submit'>";
- echo "</td></tr></table></div></form>";
-}
-
-
-function showNetworkingList($target,$username,$field,$phrasetype,$contains,$sort,$order,$start,$deleted) {
-
- // Lists networking
-
- GLOBAL $cfg_install, $cfg_layout, $cfg_features, $lang, $HTMLRel;;
-
- $db = new DB;
-
- // Build query
- if($field=="all") {
- $where = " (";
- $fields = $db->list_fields("glpi_networking");
- $columns = $db->num_fields($fields);
-
- for ($i = 0; $i < $columns; $i++) {
- if($i != 0) {
- $where .= " OR ";
- }
- $coco = mysql_field_name($fields, $i);
-
- if($coco == "firmware") {
- $where .= " glpi_dropdown_firmware.name LIKE '%".$contains."%'";
- }
- elseif($coco == "location") {
- $where .= " glpi_dropdown_locations.name LIKE '%".$contains."%'";
- }
- elseif($coco == "type") {
- $where .= " glpi_type_networking.name LIKE '%".$contains."%'";
- }
- else {
- $where .= "glpi_networking.".$coco . " LIKE '%".$contains."%'";
- }
- }
- $where .= " OR glpi_networking_ports.ifaddr LIKE '%".$contains."%'";
- $where .= " OR glpi_networking_ports.ifmac LIKE '%".$contains."%'";
- $where .= " OR glpi_dropdown_netpoint.name LIKE '%".$contains."%'";
- $where.=" OR glpi_enterprises.name LIKE '%".$contains."%'";
- $where .= ")";
- }
- else {
- if ($phrasetype == "contains") {
- $where = "($field LIKE '%".$contains."%')";
- }
- else {
- $where = "($field LIKE '".$contains."')";
- }
- }
-
- if (!$start) {
- $start = 0;
- }
- if (!$order) {
- $order = "ASC";
- }
- $query = "select DISTINCT glpi_networking.ID from glpi_networking LEFT JOIN glpi_dropdown_locations on glpi_networking.location=glpi_dropdown_locations.ID ";
- $query .= "LEFT JOIN glpi_type_networking on glpi_networking.type = glpi_type_networking.ID ";
- $query .= "LEFT JOIN glpi_dropdown_firmware on glpi_networking.firmware = glpi_dropdown_firmware.ID ";
- $query .= "LEFT JOIN glpi_networking_ports on (glpi_networking.ID = glpi_networking_ports.on_device AND glpi_networking_ports.device_type='2')";
- $query .= "LEFT JOIN glpi_dropdown_netpoint on (glpi_dropdown_netpoint.ID = glpi_networking_ports.netpoint)";
- $query.= " LEFT JOIN glpi_enterprises ON (glpi_enterprises.ID = glpi_networking.FK_glpi_enterprise ) ";
- $query .= "where $where AND glpi_networking.deleted='$deleted' ORDER BY $sort $order";
-
- // Get it from database
- if ($result = $db->query($query)) {
- $numrows = $db->numrows($result);
-
- // Limit the result, if no limit applies, use prior result
- if ($numrows>$cfg_features["list_limit"]) {
- $query_limit = $query ." LIMIT $start,".$cfg_features["list_limit"]." ";
- $result_limit = $db->query($query_limit);
- $numrows_limit = $db->numrows($result_limit);
-
- } else {
- $numrows_limit = $numrows;
- $result_limit = $result;
- }
-
-
- if ($numrows_limit>0) {
- // Produce headline
- echo "<center><table class='tab_cadre'><tr>";
-
- // Name
- echo "<th>";
- if ($sort=="glpi_networking.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_networking.name&order=ASC&start=$start\">";
- echo $lang["networking"][0]."</a></th>";
-
- // Manufacturer
- echo "<th>";
- if ($sort=="glpi_enterprises.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_enterprises.name&order=ASC&start=$start\">";
- echo $lang["common"][5]."</a></th>";
-
- // Location
- echo "<th>";
- if ($sort=="glpi_dropdown_locations.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_dropdown_locations.name&order=ASC&start=$start\">";
- echo $lang["networking"][1]."</a></th>";
-
- // Type
- echo "<th>";
- if ($sort=="glpi_type_networking.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_type_networking.name&order=ASC&start=$start\">";
- echo $lang["networking"][2]."</a></th>";
-
-
- // Firmware
- echo "<th>";
- if ($sort=="glpi_dropdown_firmware.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_dropdown_firmware.name&order=ASC&start=$start\">";
- echo $lang["networking"][49]."</a></th>";
-
-
-
- // Last modified
- echo "<th>";
- if ($sort=="glpi_networking.date_mod") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_networking.date_mod&order=DESC&start=$start\">";
- echo $lang["networking"][9]."</a></th>";
-
- echo "</tr>";
-
- for ($i=0; $i < $numrows_limit; $i++) {
- $ID = $db->result($result_limit, $i, "ID");
- $networking = new Netdevice;
- $networking->getfromDB($ID);
- echo "<tr class='tab_bg_2'>";
- echo "<td><b>";
- echo "<a href=\"".$cfg_install["root"]."/networking/networking-info-form.php?ID=$ID\">";
- echo $networking->fields["name"]." (".$networking->fields["ID"].")";
- echo "</a></b></td>";
- echo "<td>". getDropdownName("glpi_enterprises",$networking->fields["FK_glpi_enterprise"]) ."</td>";
- echo "<td>". getDropdownName("glpi_dropdown_locations",$networking->fields["location"]) ."</td>";
- echo "<td>". getDropdownName("glpi_type_networking",$networking->fields["type"]) ."</td>";
- echo "<td>". getDropdownName("glpi_dropdown_firmware",$networking->fields["firmware"]) ."</td>";
- echo "<td>".$networking->fields["date_mod"]."</td>";
- echo "</tr>";
- }
-
- // Close Table
- echo "</table></center>";
-
- // Pager
- $parameters="field=$field&phrasetype=$phrasetype&contains=$contains&sort=$sort&order=$order";
- printPager($start,$numrows,$target,$parameters);
-
- } else {
- echo "<center><b>".$lang["networking"][38]."</b></center>";
- echo "<hr noshade>";
- }
- }
-}
-
-
-
-
-function showNetworkingForm ($target,$ID) {
- // Show device or blank form
-
- GLOBAL $cfg_layout,$cfg_install, $lang,$HTMLRel;
-
- $netdev = new Netdevice;
-
- echo "<div align='center'><form name='form' method='post' action=\"$target\">";
- echo "<table class='tab_cadre' cellpadding='2'>";
- echo "<tr><th colspan='2'><b>";
- if (empty($ID)) {
- echo $lang["networking"][11].":";
- $netdev->getEmpty();
- } else {
- $netdev->getfromDB($ID);
- echo $lang["networking"][12]." ID $ID:";
- }
- echo "</b></th></tr>";
-
- echo "<tr><td class='tab_bg_1' valign='top'>";
-
- echo "<table cellpadding='1px' cellspacing='0' border='0'>\n";
-
- echo "<tr><td>".$lang["networking"][0].": </td>";
- echo "<td><input type='text' name='name' value=\"".$netdev->fields["name"]."\" size='20'></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["networking"][1].": </td><td>";
- dropdownValue("glpi_dropdown_locations", "location", $netdev->fields["location"]);
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_1'><td>".$lang["common"][5].": </td><td colspan='2'>";
- dropdownValue("glpi_enterprises","FK_glpi_enterprise",$netdev->fields["FK_glpi_enterprise"]);
- echo "</td></tr>";
-
- echo "<tr><td>".$lang["networking"][4].": </td>";
- echo "<td><input type='text' name='contact_num' value=\"".$netdev->fields["contact_num"]."\" size='20'></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["networking"][3].": </td>";
- echo "<td><input type='text' name='contact' size='20' value=\"".$netdev->fields["contact"]."\"></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["networking"][53].": </td><td>";
- dropdownValue("glpi_contacts", "tech_num", $netdev->fields["tech_num"]);
- echo "</td></tr>";
-
-
- if (!empty($ID)){
- echo "<tr><td>".$lang["reservation"][24].":</td><td><b>";
- showReservationForm(2,$ID);
- echo "</b></td></tr>";
- }
- echo "</table>";
-
- echo "</td>\n";
- echo "<td class='tab_bg_1' valign='top'>";
-
- echo "<table cellpadding='1px' cellspacing='0' border='0'";
-
- echo "<tr><td>".$lang["networking"][2].": </td><td>";
- dropdownValue("glpi_type_networking", "type", $netdev->fields["type"]);
- echo "</td></tr>";
-
- echo "<tr><td>".$lang["networking"][49].": </td><td>";
- dropdownValue("glpi_dropdown_firmware", "firmware", $netdev->fields["firmware"]);
- echo "</td></tr>";
-
- echo "<tr><td>".$lang["networking"][5].": </td>";
- echo "<td><input type='text' name='ram' value=\"".$netdev->fields["ram"]."\" size='10'></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["networking"][6].": </td>";
- echo "<td><input type='text' name='serial' size='20' value=\"".$netdev->fields["serial"]."\"></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["networking"][7].":</td>";
- echo "<td><input type='text' size='20' name='otherserial' value=\"".$netdev->fields["otherserial"]."\"></td>";
- echo "</tr>";
- echo "</table>";
-
- echo "</td>\n";
- echo "</tr>";
- echo "<tr>";
- echo "<td class='tab_bg_1' valign='top' colspan='2'>";
-
- echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'><tr><td valign='top'>";
- echo $lang["networking"][8].": </td>";
- echo "<td align='center'><textarea cols='35' rows='4' name='comments' >".$netdev->fields["comments"]."</textarea>";
- echo "</td></tr></table>";
-
- echo "</td>";
- echo "</tr>";
-
- if (!$ID) {
-
- echo "<tr>";
- echo "<td class='tab_bg_2' valign='top' colspan='2'>";
- echo "<div align='center'><input type='submit' name='add' value=\"".$lang["buttons"][8]."\" class='submit'></div>";
- echo "</td>";
- echo "</form></tr>";
-
- echo "</table></div>";
-
- } else {
-
- echo "<tr>";
- echo "<td class='tab_bg_2' valign='top'>";
- echo "<input type='hidden' name='ID' value=\"$ID\">\n";
- echo "<div align='center'><input type='submit' name='update' value=\"".$lang["buttons"][7]."\" class='submit'></div>";
- echo "</td></form>\n\n";
- echo "<form action=\"$target\" method='post'>\n";
- echo "<td class='tab_bg_2' valign='top'>\n";
- echo "<input type='hidden' name='ID' value=\"$ID\">\n";
- echo "<div align='center'>";
- if ($netdev->fields["deleted"]=='N')
- echo "<input type='submit' name='delete' value=\"".$lang["buttons"][6]."\" class='submit'>";
- else {
- echo "<input type='submit' name='restore' value=\"".$lang["buttons"][21]."\" class='submit'>";
-
- echo " <input type='submit' name='purge' value=\"".$lang["buttons"][22]."\" class='submit'>";
- }
- echo "</div>";
- echo "</td>";
- echo "</form></tr>";
-
- echo "</table></div>";
-
- showPorts($ID,NETWORKING_TYPE);
-
- showPortsAdd($ID,NETWORKING_TYPE);
- }
-}
-
-function addNetdevice($input) {
- // Add Netdevice, nasty hack until we get PHP4-array-functions
-
- $netdev = new Netdevice;
-
- // dump the status
- $null = array_pop($input);
-
- // fill array for update
- foreach ($input as $key => $val) {
- if (empty($netdev->fields[$key]) || $netdev->fields[$key] != $input[$key]) {
- $netdev->fields[$key] = $input[$key];
- }
- }
-
- if ($netdev->addToDB()) {
- return true;
- } else {
- return false;
- }
-}
-
-function updateNetdevice($input) {
- // Update a netdevice in the database
-
- $netdev = new Netdevice;
- $netdev->getFromDB($input["ID"]);
-
- // set new date and make sure it gets updated
- $updates[0]= "date_mod";
- $netdev->fields["date_mod"] = date("Y-m-d H:i:s");
-
- // Pop off the last two attributes, no longer needed
- $null=array_pop($input);
- $null=array_pop($input);
-
- // Get all flags and fill with 0 if unchecked in form
- foreach ($netdev->fields as $key => $val) {
- if (eregi("\.*flag\.*",$key)) {
- if (!$input[$key]) {
- $input[$key]=0;
- }
- }
- }
-
- // Fill the update-array with changes
- $x=1;
- foreach ($input as $key => $val) {
- if ($netdev->fields[$key] != $input[$key]) {
- $netdev->fields[$key] = $input[$key];
- $updates[$x] = $key;
- $x++;
- }
- }
-
- $netdev->updateInDB($updates);
-
-}
-
-function deleteNetdevice($input,$force=0) {
- // Delete Netdevice
-
- $netdev = new Netdevice;
- $netdev->deleteFromDB($input["ID"],$force);
-}
-
-function restoreNetdevice($input) {
- // Restore Netdevice
-
- $ct = new Netdevice;
- $ct->restoreInDB($input["ID"]);
-}
-
-
-
-///// Manage Ports on Devices /////
-
-function showPorts ($device,$device_type) {
-
- GLOBAL $cfg_layout,$cfg_install, $lang;
-
- $db = new DB;
- switch($device_type) {
- case COMPUTER_TYPE :
- $device_real_table_name = "glpi_computers";
- break;
- case NETWORKING_TYPE :
- $device_real_table_name = "glpi_networking";
- break;
- case PRINTER_TYPE :
- $device_real_table_name = "glpi_printers";
- break;
- }
- $query = "SELECT location from ".$device_real_table_name." where ID = ".$device."";
- $location = $db->result($db->query($query),0,"location");
-
- $query = "SELECT ID FROM glpi_networking_ports WHERE (on_device = $device AND device_type = $device_type) ORDER BY logical_number";
- if ($result = $db->query($query)) {
- if ($db->numrows($result)!=0) {
- echo "<br><div align='center'><table class='tab_cadre' width='90%'>";
- echo "<tr><th colspan='7'>";
- echo $db->numrows($result)." ";
- if ($db->numrows($result)<2) {
- echo $lang["networking"][37];
- } else {
- echo $lang["networking"][13];
- }
- echo ":</th></tr>";
- echo "<tr><th>#</th><th>".$lang["networking"][0]."</th><th>".$lang["networking"][51]."</th>";
- echo "<th>".$lang["networking"][14]."</th><th>".$lang["networking"][15]."</th>";
- echo "<th>".$lang["networking"][16]."</th><th>".$lang["networking"][17].":</th></tr>\n";
- $i=0;
- while ($devid=$db->fetch_row($result)) {
- $netport = new Netport;
- $netport->getfromDB(current($devid));
- echo "<tr class='tab_bg_1'>";
- echo "<td align='center'><b>";
- echo "<a href=\"".$cfg_install["root"]."/networking/networking-port.php?ID=".$netport->fields["ID"]."&location=".$location."\">";
- echo $netport->fields["logical_number"];
- echo "</a>";
- echo "</b></td>";
- echo "<td>".$netport->fields["name"]."</td>";
- echo "<td>".getDropdownName("glpi_dropdown_netpoint",$netport->fields["netpoint"])."</td>";
- echo "<td>".$netport->fields["ifaddr"]."</td>";
- echo "<td>".$netport->fields["ifmac"]."</td>";
- echo "<td>".getDropdownName("glpi_dropdown_iface",$netport->fields["iface"])."</td>";
- echo "<td>";
- showConnection($netport->fields["ID"]);
- echo "</td>";
- echo "</tr>";
- }
- echo "</table></div>\n\n";
- }
- }
-}
-
-
-
-function showNetportForm($target,$ID,$ondevice,$devtype,$several,$search = '', $location = '') {
-
- GLOBAL $cfg_install, $cfg_layout, $lang, $REFERER;
-
- $netport = new Netport;
- if($ID)
- {
- $netport->getFromDB($ID);
- $netport->getDeviceData($netport->fields["on_device"],$netport->fields["device_type"]);
- }
- else
- {
- $netport->getFromNull();
- }
-
- // Ajout des infos déjà remplies
- if (isset($_POST)&&!empty($_POST)){
- foreach ($netport->fields as $key => $val)
- if ($key!='ID'&&isset($_POST[$key]))
- $netport->fields[$key]=$_POST[$key];
- }
-
-
- echo "<div align='center'>";
- echo "<b><a href='$REFERER'>".$lang["buttons"][13]."</a></b>";
- echo "<table class='tab_cadre'><tr>";
-
- echo "<th colspan='4'>".$lang["networking"][20].":</th>";
- echo "</tr>";
- echo "<form method='post' action=\"$target\">";
- echo "<input type='hidden' name='referer' value='$REFERER'>";
-
- if ($several!="yes"){
- echo "<tr class='tab_bg_1'><td>".$lang["networking"][21].":</td>";
- echo "<td><input type='text' size='5' name='logical_number' value=\"".$netport->fields["logical_number"]."\">";
- echo "</td></tr>";
- }
- else {
- echo "<tr class='tab_bg_1'><td>".$lang["networking"][21].":</td>";
- echo "<input type='hidden' name='several' value='yes'>";
- echo "<input type='hidden' name='logical_number' value=''>";
- echo "<td>";
- echo $lang["networking"][47].":<select name='from_logical_number'>";
- for ($i=0;$i<100;$i++)
- echo "<option value='$i'>$i</option>";
- echo "</select>";
- echo $lang["networking"][48].":<select name='to_logical_number'>";
- for ($i=0;$i<100;$i++)
- echo "<option value='$i'>$i</option>";
- echo "</select>";
-
- echo "</td></tr>";
- }
-
- echo "<tr class='tab_bg_1'><td>".$lang["networking"][0]."</td>";
- echo "<td><input type='text' size='20' name='name' value=\"".$netport->fields["name"]."\">";
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_1'><td>".$lang["networking"][16]."</td><td>";
- dropdownValue("glpi_dropdown_iface","iface", $netport->fields["iface"]);
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_1'><td>".$lang["networking"][22]."</td>";
- echo "<td><input type='text' size='20' name='ifaddr' value=\"".$netport->fields["ifaddr"]."\">";
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_1'><td>".$lang["networking"][23]."</td>";
- echo "<td><input type='text' size='25' name='ifmac' value=\"".$netport->fields["ifmac"]."\">";
- echo "</td></tr>";
-
- if ($several!="yes"){
- echo "<tr class='tab_bg_1'><td>".$lang["networking"][51].":</td>";
-
- echo "<td align='center' >";
- NetpointLocationSearch($search,"netpoint",$location,$netport->fields["netpoint"]);
- echo "<input type='text' size='10' name='search'>";
- echo "<input type='submit' value=\"".$lang["buttons"][0]."\" name='Modif_Interne' class='submit'>";
- echo "</td></tr>";
- }
- if ($ID) {
- echo "<tr class='tab_bg_1'><td>".$lang["networking"][24]."</td>";
- echo "<td>";
- showConnection($netport->fields["ID"]);
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_2'>";
- echo "<td align='center'>";
- echo "<input type='hidden' name='ID' value=".$netport->fields["ID"].">";
- echo "<input type='submit' name='update' value=\"".$lang["buttons"][7]."\" class='submit'>";
- echo "</td></form>";
-
- echo "<form method='post' action=$target>";
- echo "<input type='hidden' name='ID' value=$ID>";
- echo "<td align='center'>";
- echo "<input type='submit' name='delete' value=\"".$lang["buttons"][6]."\" class='submit'>";
- echo "</td></tr></form>";
- } else
- {
-
- echo "<tr class='tab_bg_2'>";
- echo "<td align='center' colspan='2'>";
- echo "<input type='hidden' name='on_device' value='$ondevice'>";
- echo "<input type='hidden' name='device_type' value='$devtype'>";
- echo "<input type='submit' name='add' value=\"".$lang["buttons"][8]."\" class='submit'>";
- echo "</td></form>";
- }
-
- echo "</table>";
-}
-
-function addNetport($input) {
- // Add Netport, nasty hack until we get PHP4-array-functions
-
- $netport = new Netport;
-
- // dump status
- unset($input['search']);
- $null = array_pop($input);
-
- // fill array for update
- foreach ($input as $key => $val) {
- if (!isset($netport->fields[$key]) || $netport->fields[$key] != $input[$key]) {
- $netport->fields[$key] = $input[$key];
- }
- }
-
- if ($netport->addToDB()) {
- return true;
- } else {
- return false;
- }
-}
-
-function updateNetport($input) {
- // Update a port
-
- $netport = new Netport;
- $netport->getFromDB($input["ID"]);
-
- // Pop off the last two attributes, no longer needed
- unset($input['referer']);
- unset($input['search']);
- $null=array_pop($input);
- // Fill the update-array with changes
- $x=0;
- $updates=array();
- foreach ($input as $key => $val) {
- if ($netport->fields[$key] != $input[$key]) {
- $netport->fields[$key] = $input[$key];
- $updates[$x] = $key;
- $x++;
- }
- }
- $netport->updateInDB($updates);
-}
-
-function deleteNetport($input) {
-
- // Delete Netwire
- removeConnector($input["ID"]);
-
- // Delete Netport
- $netport = new Netport;
- $netport->deleteFromDB($input["ID"]);
-
-
-
-}
-
-function showPortsAdd($ID,$devtype) {
-
- GLOBAL $cfg_layout, $cfg_install, $lang;
- $db = new DB;
- switch($devtype) {
- case COMPUTER_TYPE :
- $device_real_table_name = "glpi_computers";
- break;
- case NETWORKING_TYPE :
- $device_real_table_name = "glpi_networking";
- break;
- case PRINTER_TYPE :
- $device_real_table_name = "glpi_printers";
- break;
- }
- $query = "SELECT location from ".$device_real_table_name." where ID = ".$ID."";
- $location = $db->result($db->query($query),0,"location");
-
- echo "<div align='center'><table class='tab_cadre' width='90%' cellpadding='2'>";
- echo "<tr>";
- echo "<td align='center' class='tab_bg_2' >";
- echo "<a href=\"".$cfg_install["root"]."/networking/networking-port.php?on_device=$ID&device_type=$devtype&location=$location\"><b>";
- echo $lang["networking"][19];
- echo "</b></a></td>";
- echo "<td align='center' class='tab_bg_2' width='50%'>";
- echo "<a href=\"".$cfg_install["root"]."/networking/networking-port.php?ondevice=$ID&devtype=$devtype&several=yes&location=$location\"><b>";
- echo $lang["networking"][46];
- echo "</b></a></td>";
-
- echo "</tr>";
- echo "</table></div><br>";
-}
-
-function showConnection ($ID) {
-
- GLOBAL $cfg_layout, $cfg_install, $lang;
-
- $contact = new Netport;
- if ($contact->getContact($ID)) {
- $netport = new Netport;
- $netport->getfromDB($contact->contact_id);
- $netport->getDeviceData($netport->fields["on_device"],$netport->fields["device_type"]);
- echo "\n\n<table border='0' cellspacing='0' width='100%'><tr ".($netport->deleted=='Y'?"class='tab_bg_2_2'":"").">";
- echo "<td><b>";
- echo "<a href=\"".$cfg_install["root"]."/networking/networking-port.php?ID=".$netport->fields["ID"]."\">";
- if (rtrim($netport->fields["name"])!="")
- echo $netport->fields["name"];
- else echo $lang["common"][0];
- echo "</a></b>";
- echo " ".$lang["networking"][25]." <b>";
- if ($netport->fields["device_type"]==1) {
- echo "<a href=\"".$cfg_install["root"]."/computers/computers-info-form.php?ID=".$netport->device_ID."\">";
- } else if ($netport->fields["device_type"]==2) {
- echo "<a href=\"".$cfg_install["root"]."/networking/networking-info-form.php?ID=".$netport->device_ID."\">";
- } else if ($netport->fields["device_type"]==3) {
- echo "<a href=\"".$cfg_install["root"]."/printers/printers-info-form.php?ID=".$netport->device_ID."\">";
- }
- echo $netport->device_name." (".$netport->device_ID.")";
- echo "</a>";
- echo "</b></td>";
- echo "<td align='right'><b>";
- echo "<a href=\"".$cfg_install["root"]."/networking/networking-port-disconnect.php?ID=$ID\">".$lang["buttons"][10]."</a>";
- echo "</b></td>";
- echo "</tr></table>";
-
- } else {
- echo "<table border='0' cellspacing='0' width='100%'><tr>";
- echo "<td>".$lang["networking"][26]."</td>";
- echo "<td align='right'><b>";
- echo "<a href=\"".$cfg_install["root"]."/networking/networking-port-connect.php?ID=$ID\">".$lang["buttons"][9]."</a>";
- echo "</b></td>";
- echo "</tr></table>";
- }
-}
-
-
-///// Wire the Ports /////
-
-
-function showConnectorSearch($target,$ID) {
-
- GLOBAL $cfg_layout,$cfg_install, $lang;
-
-
- echo "<div align='center'><form method='post' action=\"$target\"><table border='0' class='tab_cadre'>";
- echo "<tr><th colspan='2'>".$lang["networking"][27]." $ID ".$lang["networking"][28].":</th></tr>";
-
- echo "<tr class='tab_bg_1'>";
-
- echo "<td>".$lang["networking"][29]." <select name=type>";
- echo "<option value='name'>".$lang["networking"][0]."</option>";
- echo "<option value='id'>ID</option>";
- echo "</select>";
- echo $lang["networking"][30]." <input type='text' size='10' name='comp'>";
- echo "<input type='hidden' name='pID1' value=$ID>";
- echo "<input type='hidden' name='next' value=\"compsearch\">";
- echo "</td><td class='tab_bg_2'>";
- echo "<input type='submit' value=\"".$lang["buttons"][11]."\" class='submit'>";
- echo "</td></tr>";
- echo "</form>";
-
- echo "<tr class='tab_bg_1'>";
- echo "<form method='post' action=\"$target\">";
- echo "<td>".$lang["networking"][31].":";
- $db = new DB;
- $query = "SELECT glpi_networking.ID AS ID, glpi_networking.name AS name, glpi_dropdown_locations.ID as location from glpi_networking LEFT JOIN glpi_dropdown_locations ON glpi_networking.location = glpi_dropdown_locations.id";
- $result = $db->query($query);
- $number = $db->numrows($result);
- echo "<select name='dID'>";
- $i=0;
- while ($i < $number)
- {
- $dID = $db->result($result, $i, "ID");
- $name = $db->result($result, $i, "name");
- $location = $db->result($result, $i, "location");
- echo "<option value=$dID>$name (".getTreeValueName("glpi_dropdown_locations",$location).")</option>";
- $i++;
- }
- echo "</select>";
- echo "<input type='hidden' name='pID1' value=$ID>";
- echo "<input type='hidden' name='next' value=\"showports\">";
- echo "<input type='hidden' name='device_type' value='2'>";
- echo "</td><td class='tab_bg_2'>";
- echo "<input type='submit' value=\"".$lang["buttons"][11]."\" class='submit'>";
- echo "</td></tr>";
- echo "</table>";
- echo "</form>";
-}
-
-function listConnectorComputers($target,$input) {
-
- GLOBAL $cfg_layout,$cfg_install, $lang;
-
- $pID1 = $input["pID1"];
-
- echo "<div align='center'><form method='post' action=\"$target\"><table border='0' class='tab_cadre'>";
- echo "<tr><th colspan='2'>".$lang["networking"][27]." $pID1 ".$lang["networking"][32].". ".$lang["networking"][33].":</th></tr>";
- echo "<tr><td>";
-
- echo "<tr class='tab_bg_1'>";
- echo "<td align='center'>";
-
- $db = new DB;
- if ($input["type"] == "name") {
- $query = "SELECT glpi_computers.ID as ID, glpi_computers.name as name, glpi_dropdown_locations.ID as location from glpi_computers, glpi_dropdown_locations WHERE glpi_computers.location = glpi_dropdown_locations.id AND glpi_computers.name LIKE '%".$input["comp"]."%'";
- } else {
- $query = "SELECT glpi_computers.ID as ID, glpi_computers.name as name, glpi_dropdown_locations.ID as location from glpi_computers, glpi_dropdown_locations WHERE glpi_computers.location = glpi_dropdown_locations.id AND glpi_computers.ID LIKE '%".$input["comp"]."%'";
- }
-//echo $query;
- $query.= " ORDER BY glpi_computers.name";
- $result = $db->query($query);
- $number = $db->numrows($result);
- echo "<select name='dID'>";
- $i=0;
- while ($i < $number)
- {
- $dID = $db->result($result, $i, "ID");
- $name = $db->result($result, $i, "name");
- $location = $db->result($result, $i, "location");
- echo "<option value=$dID>$dID - $name (".getTreeValueName("glpi_dropdown_locations",$location).")</option>";
- $i++;
- }
- echo "</select>";
-
- echo "</td>";
- echo "<td class='tab_bg_2' align='center'>";
- echo "<input type='hidden' name='device_type' value='1'>";
- echo "<input type='hidden' name='pID1' value=\"".$pID1."\">";
- echo "<input type='hidden' name='next' value=\"showports\">";
- echo "<input type='submit' value=\"".$lang["buttons"][11]."\">";
- echo "</td></tr></table></form>";
-
-}
-
-function listConnectorPorts($target,$input) {
-
- GLOBAL $cfg_layout,$cfg_install,$lang;
-
- $pID1 = $input["pID1"];
-
- $db = new DB;
- $query = "SELECT * FROM glpi_networking_ports WHERE (on_device = ".$input["dID"]." AND device_type = ".$input["device_type"].") ORDER BY logical_number";
- $result = $db->query($query);
- $number = $db->numrows($result);
-
- if ($number < 1) {
- echo "<div align='center'><b>".$lang["networking"][34]."</b></div>";
- } else {
-
- echo "<div align='center'><table border='0' cellspacing=2 width='90%' class='tab_cadre'>";
- echo "<tr><th>".$lang["networking"][27]." $pID1 ".$lang["networking"][35].". ".$lang["networking"][36]." ".$input["dID"].":</th></tr>";
- echo "</table></div>";
-
- echo "\n\n<br><div align='center'><table border='0' cellpadding='2' width='90%' class='tab_cadre'>";
- echo "<tr><th>#</th><th>".$lang["networking"][0]."</th><th>".$lang["networking"][51]."</th>";
- echo "<th>".$lang["networking"][14]."</th><th>".$lang["networking"][15]."</th>";
- echo "<th>".$lang["networking"][16]."</th><th>".$lang["networking"][17].":</th></tr>\n";
-
- while ($data = $db->fetch_array($result)) {
- $pID2 = $data["ID"];
-
- $contact = new Netport;
-
- echo "<tr class='tab_bg_1'>";
- echo "<td>".$data["logical_number"]."</td>";
- echo "<td>";
- echo "<a href=\"".$cfg_install["root"]."/networking/networking-port.php?ID=".$data["ID"]."\">";
- echo $data["name"];
- echo "</a>";
- echo "</td>";
- echo "<td>".getDropdownName("glpi_dropdown_netpoint",$data["netpoint"])."</td>";
- echo "<td>".$data["ifaddr"]."</td>";
- echo "<td>".$data["ifmac"]."</td>";
- echo "<td>".getDropdownName("glpi_dropdown_iface",$data["iface"])."</td>";
- echo "<td>";
-
- if ($contact->getContact($pID2)) {
- $netport = new Netport;
- $netport->getfromDB($contact->contact_id);
- $netport->getDeviceData($netport->fields["on_device"],$netport->fields["device_type"]);
- echo "\n\n<table border='0' cellspacing='0' width='100%'><tr>";
- echo "<td>";
- echo "<a href=\"".$cfg_install["root"]."/networking/networking-port.php?ID=".$netport->fields["ID"]."\">";
- echo $netport->fields["name"];
- echo "</a> ";
- echo $lang["networking"][25];
- echo " <a href=\"".$cfg_install["root"]."/computers/computers-info-form.php?ID=".$netport->device_ID."\">";
- echo $netport->device_name." (".$netport->device_ID.")";
- echo "</a>";
- echo "</td>";
- echo "<td align='right'><b>";
- echo "<a href=\"".$cfg_install["root"]."/networking/networking-port-disconnect.php?ID=".$netport->fields["ID"];
- if (!empty($pID1)) echo "&sport=$pID1";
- echo "\">".$lang["buttons"][10]."</a>";
- echo "</b></td>";
- echo "</tr></table>";
-
- } else {
- echo "<table border='0' cellspacing='0' width='100%'><tr>";
- echo "<td>".$lang["networking"][26]."</td>";
- echo "<td align='right'><b>";
- echo "<a href=\"$target?next=connect&sport=$pID1&dport=$pID2\">".$lang["buttons"][9]."</a>";
- echo "</b></td>";
- echo "</tr></table>";
- }
-
- echo "</td>";
- echo "</tr>";
- }
- echo "</table>";
- }
-}
-
-function makeConnector($sport,$dport) {
-
- GLOBAL $cfg_layout, $cfg_install, $lang;
-
- $db = new DB;
- // Get netpoint for $sport and $dport
- $ps=new Netport;
- $ps->getFromDB($sport);
- $nps="";
- $ips="";
- $macs="";
- if (isset($ps->fields["netpoint"]))
- $nps=$ps->fields["netpoint"];
- if (isset($ps->fields["ifaddr"]))
- $ips=$ps->fields["ifaddr"];
- if (isset($ps->fields["ifmac"]))
- $macs=$ps->fields["ifmac"];
-
- $pd=new Netport;
- $pd->getFromDB($dport);
- $npd="";
- $ipd="";
- $macd="";
- if (isset($pd->fields["netpoint"]))
- $npd=$pd->fields["netpoint"];
- if (isset($pd->fields["ifaddr"]))
- $ipd=$pd->fields["ifaddr"];
- if (isset($pd->fields["ifmac"]))
- $macd=$pd->fields["ifmac"];
-
- // Update unknown IP
- $updates[0]="ifaddr";
- if (empty($ips)&&!empty($ipd)){
- $ps->fields["ifaddr"]=$ipd;
- $ps->updateInDB($updates);
- echo "<div align='center'><b>".$lang["connect"][19]."</b></div>";
- }
- else if (!empty($ips)&&empty($ipd)){
- $pd->fields["ifaddr"]=$ips;
- $pd->updateInDB($updates);
- echo "<div align='center'><b>".$lang["connect"][19]."</b></div>";
- }
- else if ($ips!=$ipd){
- echo "<div align='center'><b>".$lang["connect"][20]."</b></div>";
- }
- // Update unknown MAC
- $updates[0]="ifmac";
- if (empty($macs)&&!empty($macd)){
- $ps->fields["ifmac"]=$macd;
- $ps->updateInDB($updates);
- echo "<div align='center'><b>".$lang["connect"][21]."</b></div>";
- }
- else if (!empty($macs)&&empty($macd)){
- $pd->fields["ifmac"]=$macs;
- $pd->updateInDB($updates);
- echo "<div align='center'><b>".$lang["connect"][21]."</b></div>";
- }
- else if ($macs!=$macd){
- echo "<div align='center'><b>".$lang["connect"][22]."</b></div>";
- }
- // Update unknown netpoint
- $updates[0]="netpoint";
- if (empty($nps)&&!empty($npd)){
- $ps->fields["netpoint"]=$npd;
- $ps->updateInDB($updates);
- echo "<div align='center'><b>".$lang["connect"][17]."</b></div>";
- }
- else if (!empty($nps)&&empty($npd)){
- $pd->fields["netpoint"]=$nps;
- $pd->updateInDB($updates);
- echo "<div align='center'><b>".$lang["connect"][17]."</b></div>";
- }
- else if ($nps!=$npd){
- echo "<div align='center'><b>".$lang["connect"][18]."</b></div>";
- }
-
- $query = "INSERT INTO glpi_networking_wire VALUES (NULL,$sport,$dport)";
- if ($result = $db->query($query)) {
-
- echo "<br><div align='center'><b>".$lang["networking"][44]." ".$ps->fields['logical_number']." (".$ps->fields['ifaddr']." - ".$ps->fields['ifmac'].") ".$lang["networking"][45]." ".$ps->fields['logical_number']." (".$pd->fields['ifaddr']." - ".$pd->fields['ifmac'].") </b></div>";
- return true;
- } else {
- return false;
- }
-
-}
-
-function removeConnector($ID) {
-
- GLOBAL $cfg_layout, $cfg_install;
-
- // Update to blank networking item
- $nw=new Netwire;
- if ($ID2=$nw->getOppositeContact($ID)){
-
- $np1=new Netport;
- $np2=new Netport;
- $np1->getFromDB($ID);
- $np2->getFromDB($ID2);
- $npup=-1;
- if ($np1->fields["device_type"]==2&&$np2->fields["device_type"]!=2){
- $npup=$ID;
- }
- if ($np2->fields["device_type"]==2&&$np1->fields["device_type"]!=2){
- $npup=$ID2;
- }
- $db = new DB;
- if ($npup!=-1){
- $query = "UPDATE glpi_networking_ports SET netpoint=NULL, ifaddr='', ifmac='' WHERE ID='$npup'";
- $db->query($query);
- }
-
- $query = "DELETE FROM glpi_networking_wire WHERE (end1 = '$ID' OR end2 = '$ID')";
- if ($result=$db->query($query)) {
- return true;
- } else {
- return false;
- }
- } else return false;
-}
-
-
-?>
diff -Nur web/glpi/glpi/glpi/networking/_relpos.php glpi/glpi/networking/_relpos.php
--- web/glpi/glpi/glpi/networking/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/networking/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/peripherals/classes.php glpi/glpi/peripherals/classes.php
--- web/glpi/glpi/glpi/peripherals/classes.php 2005-03-07 09:57:35.000000000 +0100
+++ glpi/glpi/peripherals/classes.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/peripherals/CVS/Entries glpi/glpi/peripherals/CVS/Entries
--- web/glpi/glpi/glpi/peripherals/CVS/Entries 2005-03-07 09:57:35.000000000 +0100
+++ glpi/glpi/peripherals/CVS/Entries 2005-03-07 14:02:52.000000000 +0100
@@ -1,4 +1,4 @@
-/_relpos.php/1.3/Sat Feb 12 16:00:10 2005//
-/classes.php/1.10/Mon Mar 7 08:57:35 2005//
-/functions.php/1.27/Result of merge+Mon Mar 7 08:57:35 2005//
+/_relpos.php/1.4/Mon Mar 7 10:44:25 2005//
+/classes.php/1.11/Mon Mar 7 10:44:25 2005//
+/functions.php/1.29/Mon Mar 7 11:02:39 2005//
D
diff -Nur web/glpi/glpi/glpi/peripherals/functions.php glpi/glpi/peripherals/functions.php
--- web/glpi/glpi/glpi/peripherals/functions.php 2005-03-07 11:47:39.000000000 +0100
+++ glpi/glpi/peripherals/functions.php 2005-03-07 12:02:39.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
@@ -43,7 +44,7 @@
echo "<div align='center'><table border='0'><tr><td>";
echo "<img src=\"".$HTMLRel."pics/periphs.png\" alt='".$lang["peripherals"][0]."' title='".$lang["peripherals"][0]."'></td><td><a class='icon_consol' href=\"peripherals-add-select.php\"><b>".$lang["peripherals"][0]."</b></a>";
echo "</td>";
- echo "<td><a href='".$HTMLRel."setup/setup-templates.php?type=".PERIPHERAL_TYPE."'>".$lang["common"][8]."</a></td>";
+ echo "<td><a class='icon_consol' href='".$HTMLRel."setup/setup-templates.php?type=".PERIPHERAL_TYPE."'>".$lang["common"][9]."</a></td>";
echo "</tr></table></div>";
}
@@ -336,16 +337,7 @@
echo "<tr><td>".$lang["peripherals"][8].": </td>";
echo "<td><input type='text' name='contact' size='20' value=\"".$mon->fields["contact"]."\"></td>";
echo "</tr>";
-
-
- echo "<tr><td>".$lang["peripherals"][31].": </td><td>";
- dropdownValue("glpi_contacts", "tech_num", $mon->fields["tech_num"]);
- echo "</td></tr>";
-
-
-
if (!$template){
-
echo "<tr><td>".$lang["reservation"][24].":</td><td><b>";
showReservationForm(PERIPHERAL_TYPE,$ID);
echo "</b></td></tr>";
diff -Nur web/glpi/glpi/glpi/peripherals/functions.php~ glpi/glpi/peripherals/functions.php~
--- web/glpi/glpi/glpi/peripherals/functions.php~ 2005-03-07 11:47:20.000000000 +0100
+++ glpi/glpi/peripherals/functions.php~ 1970-01-01 01:00:00.000000000 +0100
@@ -1,549 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
-*/
-
-// Based on:
-// IRMA, Information Resource-Management and Administration
-// Christian Bauer
-// ----------------------------------------------------------------------
-// Original Author of file:
-// Purpose of file:
-// ----------------------------------------------------------------------
-
-include ("_relpos.php");
-// FUNCTIONS peripheral
-
-
-function titleperipherals(){
- GLOBAL $lang,$HTMLRel;
- echo "<div align='center'><table border='0'><tr><td>";
- echo "<img src=\"".$HTMLRel."pics/periphs.png\" alt='".$lang["peripherals"][0]."' title='".$lang["peripherals"][0]."'></td><td><a class='icon_consol' href=\"peripherals-add-select.php\"><b>".$lang["peripherals"][0]."</b></a>";
- echo "</td>";
- echo "<td><a href='".$HTMLRel."setup/setup-templates.php?type=".PERIPHERAL_TYPE."'>".$lang["common"][8]."</a></td>";
- echo "</tr></table></div>";
-}
-
-
-function searchFormperipheral($field="",$phrasetype= "",$contains="",$sort= "",$deleted="") {
- // Print Search Form
-
- GLOBAL $cfg_install, $cfg_layout, $layout, $lang,$HTMLRel;
-
- $option["periph.name"] = $lang["peripherals"][5];
- $option["periph.ID"] = $lang["peripherals"][23];
- $option["glpi_dropdown_locations.name"] = $lang["peripherals"][6];
- $option["glpi_type_peripherals.name"] = $lang["peripherals"][9];
- $option["periph.serial"] = $lang["peripherals"][10];
- $option["periph.otherserial"] = $lang["peripherals"][11] ;
- $option["periph.comments"] = $lang["peripherals"][12];
- $option["periph.contact"] = $lang["peripherals"][8];
- $option["periph.contact_num"] = $lang["peripherals"][7];
- $option["periph.date_mod"] = $lang["peripherals"][16];
- $option["glpi_enterprises.name"] = $lang["common"][5];
-
- echo "<form method='get' action=\"".$cfg_install["root"]."/peripherals/peripherals-search.php\">";
- echo "<div align='center'><table width='750' class='tab_cadre'>";
- echo "<tr><th colspan='3'><b>".$lang["search"][0].":</b></th></tr>";
- echo "<tr class='tab_bg_1'>";
- echo "<td align='center'>";
- echo "<input type='text' size='15' name=\"contains\" value=\"". $contains ."\" >";
- echo " ";
-
- echo $lang["search"][10]." ";
- echo "<select name=\"field\" size='1'>";
- echo "<option value='all' ";
- if($field == "all") echo "selected";
- echo ">".$lang["search"][7]."</option>";
- reset($option);
- foreach ($option as $key => $val) {
- echo "<option value=\"".$key."\"";
- if($key == $field) echo "selected";
- echo ">". $val ."</option>\n";
- }
- echo "</select> ";
- /*
- echo $lang["search"][1];
- echo " <select name='phrasetype' size='1' >";
- echo "<option value='contains'";
- if($phrasetype == "contains") echo "selected";
- echo ">".$lang["search"][2]."</option>";
- echo "<option value='exact'";
- if($phrasetype == "exact") echo "selected";
- echo ">".$lang["search"][3]."</option>";
- echo "</select>";
- */
-
- echo $lang["search"][4];
- echo " <select name='sort' size='1'>";
- reset($option);
- foreach ($option as $key => $val) {
- echo "<option value=\"".$key."\"";
- if($key == $sort) echo "selected";
- echo ">".$val."</option>\n";
- }
- echo "</select> ";
- echo "</td><td><input type='checkbox' name='deleted' ".($deleted=='Y'?" checked ":"").">";
- echo "<img src=\"".$HTMLRel."pics/showdeleted.png\" alt='".$lang["common"][3]."' title='".$lang["common"][3]."'>";
- echo "</td><td width='80' align='center' class='tab_bg_2'>";
- echo "<input type='submit' value=\"".$lang["buttons"][0]."\" class='submit'>";
- echo "</td></tr></table></div></form>";
-}
-
-
-function showPeripheralList($target,$username,$field,$phrasetype,$contains,$sort,$order,$start,$deleted) {
-
- // Lists peripheral
-
- GLOBAL $cfg_install, $cfg_layout, $cfg_features, $lang, $HTMLRel;
-
- $db = new DB;
-
- // Build query
- if($field=="all") {
- $where = " (";
- $fields = $db->list_fields("glpi_peripherals");
- $columns = $db->num_fields($fields);
-
- for ($i = 0; $i < $columns; $i++) {
- if($i != 0) {
- $where .= " OR ";
- }
- $coco = mysql_field_name($fields, $i);
-
- if($coco == "location") {
- $where .= " glpi_dropdown_locations.name LIKE '%".$contains."%'";
- }
- elseif($coco == "type") {
-- $where .= " glpi_type_peripherals.name LIKE '%".$contains."%'";
- }
- else {
- $where .= "periph.".$coco . " LIKE '%".$contains."%'";
- }
- }
- $where.=" OR glpi_enterprises.name LIKE '%".$contains."%'";
- $where .= ")";
- }
- else {
- if ($phrasetype == "contains") {
- $where = "($field LIKE '%".$contains."%')";
- }
- else {
- $where = "($field LIKE '".$contains."')";
- }
- }
-
- if (!$start) {
- $start = 0;
- }
- if (!$order) {
- $order = "ASC";
- }
- $query = "select periph.ID from glpi_peripherals as periph LEFT JOIN glpi_dropdown_locations on periph.location=glpi_dropdown_locations.ID ";
- $query .= "LEFT JOIN glpi_type_peripherals on periph.type = glpi_type_peripherals.ID ";
- $query.= " LEFT JOIN glpi_enterprises ON (glpi_enterprises.ID = periph.FK_glpi_enterprise ) ";
- $query .= "where $where AND periph.deleted='$deleted' AND periph.is_template = '0' ORDER BY $sort $order";
-
- // Get it from database
- if ($result = $db->query($query)) {
- $numrows = $db->numrows($result);
-
- // Limit the result, if no limit applies, use prior result
- if ($numrows > $cfg_features["list_limit"]) {
- $query_limit = $query ." LIMIT $start,".$cfg_features["list_limit"]." ";
- $result_limit = $db->query($query_limit);
- $numrows_limit = $db->numrows($result_limit);
- } else {
- $numrows_limit = $numrows;
- $result_limit = $result;
- }
-
-
- if ($numrows_limit>0) {
- // Produce headline
- echo "<center><table class='tab_cadre'><tr>";
- // Name
- echo "<th>";
- if ($sort=="periph.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=periph.name&order=ASC&start=$start\">";
- echo $lang["peripherals"][5]."</a></th>";
-
- // Manufacturer
- echo "<th>";
- if ($sort=="glpi_enterprises.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_enterprises.name&order=ASC&start=$start\">";
- echo $lang["common"][5]."</a></th>";
-
- // Location
- echo "<th>";
- if ($sort=="glpi_dropdown_locations.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_dropdown_locations.name&order=ASC&start=$start\">";
- echo $lang["peripherals"][6]."</a></th>";
-
- // Type
- echo "<th>";
- if ($sort=="glpi_type_peripherals.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_type_peripherals.name&order=ASC&start=$start\">";
- echo $lang["peripherals"][9]."</a></th>";
-
- // Last modified
- echo "<th>";
- if ($sort=="periph.date_mod") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=periph.date_mod&order=DESC&start=$start\">";
- echo $lang["peripherals"][16]."</a></th>";
-
- // Contact person
- echo "<th>";
- if ($sort=="periph.contact") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=periph.contact&order=ASC&start=$start\">";
- echo $lang["peripherals"][8]."</a></th>";
-
- echo "</tr>";
-
- for ($i=0; $i < $numrows_limit; $i++) {
- $ID = $db->result($result_limit, $i, "ID");
- $mon = new Peripheral;
- $mon->getfromDB($ID);
- echo "<tr class='tab_bg_2'>";
- echo "<td><b>";
- echo "<a href=\"".$cfg_install["root"]."/peripherals/peripherals-info-form.php?ID=$ID\">";
- echo $mon->fields["name"]." (".$mon->fields["ID"].")";
- echo "</a></b></td>";
- echo "<td>". getDropdownName("glpi_enterprises",$mon->fields["FK_glpi_enterprise"]) ."</td>";
- echo "<td>". getDropdownName("glpi_dropdown_locations",$mon->fields["location"]) ."</td>";
- echo "<td>". getDropdownName("glpi_type_peripherals",$mon->fields["type"]) ."</td>";
- echo "<td>".$mon->fields["date_mod"]."</td>";
- echo "<td>".$mon->fields["contact"]."</td>";
- echo "</tr>";
- }
-
- // Close Table
- echo "</table></center>";
-
- // Pager
- $parameters="field=$field&phrasetype=$phrasetype&contains=$contains&sort=$sort&order=$order";
- printPager($start,$numrows,$target,$parameters);
-
- } else {
- echo "<center><b>".$lang["peripherals"][17]."</b></center>";
- //echo "<hr noshade>";
- //searchFormperipheral();
- }
- }
-}
-
-
-function showperipheralForm ($target,$ID,$withtemplate='') {
-
- GLOBAL $cfg_install, $cfg_layout, $lang,$HTMLRel;
-
- $mon = new Peripheral;
-
- $mon_spotted = false;
-
- if(empty($ID) && $withtemplate == 1) {
- if($mon->getEmpty()) $mon_spotted = true;
- } else {
- if($mon->getfromDB($ID)) $mon_spotted = true;
- }
-
- if($mon_spotted) {
- if(!empty($withtemplate) && $withtemplate == 2) {
- $template = "newcomp";
- $datestring = $lang["computers"][14].": ";
- $date = date("Y-m-d H:i:s");
- } elseif(!empty($withtemplate) && $withtemplate == 1) {
- $template = "newtemplate";
- $datestring = $lang["computers"][14].": ";
- $date = date("Y-m-d H:i:s");
- } else {
- $datestring = $lang["computers"][11]." : ";
- $date = $mon->fields["date_mod"];
- $template = false;
- }
-
-
- echo "<div align='center'><form method='post' name=form action=\"$target\">";
- if(strcmp($template,"newtemplate") === 0) {
- echo "<input type=\"hidden\" name=\"is_template\" value=\"1\" />";
- }
-
- echo "<table class='tab_cadre' cellpadding='2'>";
-
- echo "<tr><th align='center' >";
- if(!$template) {
- echo $lang["peripherals"][29].": ".$mon->fields["ID"];
- }elseif (strcmp($template,"newcomp") === 0) {
- echo $lang["peripherals"][30].": ".$mon->fields["tplname"];
- }elseif (strcmp($template,"newtemplate") === 0) {
- echo $lang["common"][6]." : <input type='text' name='tplname' value=\"".$mon->fields["tplname"]."\" size='20'>";
- }
-
- echo "</th><th align='center'>".$datestring.$date;
- echo "</th></tr>";
-
- echo "<tr><td class='tab_bg_1' valign='top'>";
-
- echo "<table cellpadding='1px' cellspacing='0' border='0'>\n";
-
- echo "<tr><td>".$lang["peripherals"][5].": </td>";
- echo "<td><input type='text' name='name' value=\"".$mon->fields["name"]."\" size='20'></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["peripherals"][6].": </td><td>";
- dropdownValue("glpi_dropdown_locations", "location", $mon->fields["location"]);
- echo "</td></tr>";
-
- echo "<tr><td>".$lang["peripherals"][7].": </td>";
- echo "<td><input type='text' name='contact_num' value=\"".$mon->fields["contact_num"]."\" size='20'></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["peripherals"][8].": </td>";
- echo "<td><input type='text' name='contact' size='20' value=\"".$mon->fields["contact"]."\"></td>";
- echo "</tr>";
-
-
- echo "<tr><td>".$lang["peripherals"][29].": </td><td>";
- dropdownValue("glpi_contacts", "tech_num", $mon->fields["tech_num"]);
- echo "</td></tr>";
-
-
-
- if (!$template){
-
- echo "<tr><td>".$lang["reservation"][24].":</td><td><b>";
- showReservationForm(PERIPHERAL_TYPE,$ID);
- echo "</b></td></tr>";
- }
-
- echo "</table>";
-
- echo "</td>\n";
- echo "<td class='tab_bg_1' valign='top'>";
-
- echo "<table cellpadding='1px' cellspacing='0' border='0'>";
-
- echo "<tr><td>".$lang["peripherals"][9].": </td><td>";
- dropdownValue("glpi_type_peripherals", "type", $mon->fields["type"]);
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_1'><td>".$lang["common"][5].": </td><td colspan='2'>";
- dropdownValue("glpi_enterprises","FK_glpi_enterprise",$mon->fields["FK_glpi_enterprise"]);
- echo "</td></tr>";
-
- echo "<tr><td>".$lang["peripherals"][18].":</td>";
- echo "<td><input type='text' size='20' name='brand' value=\"".$mon->fields["brand"]."\"></td>";
- echo "</tr>";
-
-
- echo "<tr><td>".$lang["peripherals"][10].": </td>";
- echo "<td><input type='text' name='serial' size='20' value=\"".$mon->fields["serial"]."\"></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["peripherals"][11].":</td>";
- echo "<td><input type='text' size='20' name='otherserial' value=\"".$mon->fields["otherserial"]."\"></td>";
- echo "</tr>";
-
-
-echo "</td></tr>";
-
- echo "</table>";
- echo "</td>\n";
- echo "</tr>";
- echo "<tr>";
- echo "<td class='tab_bg_1' valign='top' colspan='2'>";
-
- echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'><tr><td valign='top'>";
- echo $lang["peripherals"][12].": </td>";
- echo "<td align='center'><textarea cols='35' rows='4' name='comments' >".$mon->fields["comments"]."</textarea>";
- echo "</td></tr></table>";
-
- echo "</td>";
- echo "</tr>";
-
- echo "<tr>";
-
- if ($template) {
-
- if (empty($ID)||$withtemplate==2){
- echo "<td class='tab_bg_2' align='center' colspan='2'>\n";
- echo "<input type='hidden' name='ID' value=$ID>";
- echo "<input type='submit' name='add' value=\"".$lang["buttons"][8]."\" class='submit'>";
- echo "</td>\n";
- } else {
- echo "<td class='tab_bg_2' align='center' colspan='2'>\n";
- echo "<input type='hidden' name='ID' value=$ID>";
- echo "<input type='submit' name='update' value=\"".$lang["buttons"][7]."\" class='submit'>";
- echo "</td>\n";
- }
-
-
- } else {
-
- echo "<td class='tab_bg_2' valign='top'>";
- echo "<input type='hidden' name='ID' value=\"$ID\">\n";
- echo "<center><input type='submit' name='update' value=\"".$lang["buttons"][7]."\" class='submit' class='submit'></center>";
- echo "</td></form>\n\n";
- echo "<form action=\"$target\" method='post'>\n";
- echo "<td class='tab_bg_2' valign='top'>\n";
- echo "<input type='hidden' name='ID' value=\"$ID\">\n";
- echo "<div align='center'>";
- if ($mon->fields["deleted"]=='N')
- echo "<input type='submit' name='delete' value=\"".$lang["buttons"][6]."\" class='submit'>";
- else {
- echo "<input type='submit' name='restore' value=\"".$lang["buttons"][21]."\" class='submit'>";
-
- echo " <input type='submit' name='purge' value=\"".$lang["buttons"][22]."\" class='submit'>";
- }
- echo "</div>";
- echo "</td>";
- }
- echo "</form></tr>";
-
- echo "</table></div>";
-
- return true;
- }
- else {
- echo "<div align='center'><b>".$lang["printers"][17]."</b></div>";
- echo "<hr noshade>";
- searchFormPrinters();
- return false;
- }
-
-}
-
-
-function updatePeripheral($input) {
- // Update a Peripheral in the database
-
- $mon = new Peripheral;
- $mon->getFromDB($input["ID"]);
-
- // set new date and make sure it gets updated
- $updates[0]= "date_mod";
- $mon->fields["date_mod"] = date("Y-m-d H:i:s");
-
- // Pop off the last two attributes, no longer needed
- $null=array_pop($input);
- $null=array_pop($input);
-
- // Get all flags and fill with 0 if unchecked in form
- foreach ($mon->fields as $key => $val) {
- if (eregi("\.*flag\.*",$key)) {
- if (!isset($input[$key])) {
- $input[$key]=0;
- }
- }
- }
-
- // Fill the update-array with changes
- $x=1;
- foreach ($input as $key => $val) {
- if ($mon->fields[$key] != $input[$key]) {
- $mon->fields[$key] = $input[$key];
- $updates[$x] = $key;
- $x++;
- }
- }
-
- $mon->updateInDB($updates);
-
-}
-
-function addPeripheral($input) {
- // Add Peripheral, nasty hack until we get PHP4-array-functions
- $db=new DB;
- $mon = new Peripheral;
-
- $oldID=$input["ID"];
-
- // dump status
- $null = array_pop($input);
- $null = array_pop($input);
-
- // set new date.
- $mon->fields["date_mod"] = date("Y-m-d H:i:s");
-
- // fill array for udpate
- foreach ($input as $key => $val) {
- if (!isset($mon->fields[$key]) || $mon->fields[$key] != $input[$key]) {
- $mon->fields[$key] = $input[$key];
- }
- }
-
- $mon->addToDB();
-
- $newID=$mon->getInsertElementID();
-
- // ADD Infocoms
- $ic= new Infocom();
- if ($ic->getFromDB(PERIPHERAL_TYPE,$oldID)){
- $ic->fields["FK_device"]=$newID;
- unset ($ic->fields["ID"]);
- $ic->addToDB();
- }
-
-
- // ADD Contract
- $query="SELECT FK_contract from glpi_contract_device WHERE FK_device='$oldID' AND device_type='".PERIPHERAL_TYPE."';";
- $result=$db->query($query);
- if ($db->numrows($result)>0){
-
- while ($data=$db->fetch_array($result))
- addDeviceContract($data["FK_contract"],PERIPHERAL_TYPE,$newID);
- }
-
-}
-
-function deletePeripheral($input,$force=0) {
- // Delete Printer
-
- $mon = new Peripheral;
- $mon->deleteFromDB($input["ID"],$force);
-
-}
-
-function restorePeripheral($input) {
- // Restore Peripheral
-
- $ct = new Peripheral;
- $ct->restoreInDB($input["ID"]);
-}
-
-?>
diff -Nur web/glpi/glpi/glpi/peripherals/.#functions.php.1.24 glpi/glpi/peripherals/.#functions.php.1.24
--- web/glpi/glpi/glpi/peripherals/.#functions.php.1.24 2005-03-04 12:31:16.000000000 +0100
+++ glpi/glpi/peripherals/.#functions.php.1.24 1970-01-01 01:00:00.000000000 +0100
@@ -1,472 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
-*/
-
-// Based on:
-// IRMA, Information Resource-Management and Administration
-// Christian Bauer
-// ----------------------------------------------------------------------
-// Original Author of file:
-// Purpose of file:
-// ----------------------------------------------------------------------
-
-include ("_relpos.php");
-// FUNCTIONS peripheral
-
-
-function titleperipherals(){
- GLOBAL $lang,$HTMLRel;
- echo "<div align='center'><table border='0'><tr><td>";
- echo "<img src=\"".$HTMLRel."pics/periphs.png\" alt='".$lang["peripherals"][0]."' title='".$lang["peripherals"][0]."'></td><td><a class='icon_consol' href=\"peripherals-info-form.php?new=1\"><b>".$lang["peripherals"][0]."</b></a>";
- echo "</td></tr></table></div>";
-}
-
-
-function searchFormperipheral($field="",$phrasetype= "",$contains="",$sort= "",$deleted="") {
- // Print Search Form
-
- GLOBAL $cfg_install, $cfg_layout, $layout, $lang,$HTMLRel;
-
- $option["periph.name"] = $lang["peripherals"][5];
- $option["periph.ID"] = $lang["peripherals"][23];
- $option["glpi_dropdown_locations.name"] = $lang["peripherals"][6];
- $option["glpi_type_peripherals.name"] = $lang["peripherals"][9];
- $option["periph.serial"] = $lang["peripherals"][10];
- $option["periph.otherserial"] = $lang["peripherals"][11] ;
- $option["periph.comments"] = $lang["peripherals"][12];
- $option["periph.contact"] = $lang["peripherals"][8];
- $option["periph.contact_num"] = $lang["peripherals"][7];
- $option["periph.date_mod"] = $lang["peripherals"][16];
- $option["glpi_enterprises.name"] = $lang["common"][5];
-
- echo "<form method='get' action=\"".$cfg_install["root"]."/peripherals/peripherals-search.php\">";
- echo "<div align='center'><table width='750' class='tab_cadre'>";
- echo "<tr><th colspan='3'><b>".$lang["search"][0].":</b></th></tr>";
- echo "<tr class='tab_bg_1'>";
- echo "<td align='center'>";
- echo "<input type='text' size='15' name=\"contains\" value=\"". $contains ."\" >";
- echo " ";
-
- echo $lang["search"][10]." ";
- echo "<select name=\"field\" size='1'>";
- echo "<option value='all' ";
- if($field == "all") echo "selected";
- echo ">".$lang["search"][7]."</option>";
- reset($option);
- foreach ($option as $key => $val) {
- echo "<option value=\"".$key."\"";
- if($key == $field) echo "selected";
- echo ">". $val ."</option>\n";
- }
- echo "</select> ";
- /*
- echo $lang["search"][1];
- echo " <select name='phrasetype' size='1' >";
- echo "<option value='contains'";
- if($phrasetype == "contains") echo "selected";
- echo ">".$lang["search"][2]."</option>";
- echo "<option value='exact'";
- if($phrasetype == "exact") echo "selected";
- echo ">".$lang["search"][3]."</option>";
- echo "</select>";
- */
-
- echo $lang["search"][4];
- echo " <select name='sort' size='1'>";
- reset($option);
- foreach ($option as $key => $val) {
- echo "<option value=\"".$key."\"";
- if($key == $sort) echo "selected";
- echo ">".$val."</option>\n";
- }
- echo "</select> ";
- echo "</td><td><input type='checkbox' name='deleted' ".($deleted=='Y'?" checked ":"").">";
- echo "<img src=\"".$HTMLRel."pics/showdeleted.png\" alt='".$lang["common"][3]."' title='".$lang["common"][3]."'>";
- echo "</td><td width='80' align='center' class='tab_bg_2'>";
- echo "<input type='submit' value=\"".$lang["buttons"][0]."\" class='submit'>";
- echo "</td></tr></table></div></form>";
-}
-
-
-function showPeripheralList($target,$username,$field,$phrasetype,$contains,$sort,$order,$start,$deleted) {
-
- // Lists peripheral
-
- GLOBAL $cfg_install, $cfg_layout, $cfg_features, $lang, $HTMLRel;
-
- $db = new DB;
-
- // Build query
- if($field=="all") {
- $where = " (";
- $fields = $db->list_fields("glpi_peripherals");
- $columns = $db->num_fields($fields);
-
- for ($i = 0; $i < $columns; $i++) {
- if($i != 0) {
- $where .= " OR ";
- }
- $coco = mysql_field_name($fields, $i);
-
- if($coco == "location") {
- $where .= " glpi_dropdown_locations.name LIKE '%".$contains."%'";
- }
- elseif($coco == "type") {
-- $where .= " glpi_type_peripherals.name LIKE '%".$contains."%'";
- }
- else {
- $where .= "periph.".$coco . " LIKE '%".$contains."%'";
- }
- }
- $where.=" OR glpi_enterprises.name LIKE '%".$contains."%'";
- $where .= ")";
- }
- else {
- if ($phrasetype == "contains") {
- $where = "($field LIKE '%".$contains."%')";
- }
- else {
- $where = "($field LIKE '".$contains."')";
- }
- }
-
- if (!$start) {
- $start = 0;
- }
- if (!$order) {
- $order = "ASC";
- }
- $query = "select periph.ID from glpi_peripherals as periph LEFT JOIN glpi_dropdown_locations on periph.location=glpi_dropdown_locations.ID ";
- $query .= "LEFT JOIN glpi_type_peripherals on periph.type = glpi_type_peripherals.ID ";
- $query.= " LEFT JOIN glpi_enterprises ON (glpi_enterprises.ID = periph.FK_glpi_enterprise ) ";
- $query .= "where $where AND periph.deleted='$deleted' ORDER BY $sort $order";
-
- // Get it from database
- if ($result = $db->query($query)) {
- $numrows = $db->numrows($result);
-
- // Limit the result, if no limit applies, use prior result
- if ($numrows > $cfg_features["list_limit"]) {
- $query_limit = $query ." LIMIT $start,".$cfg_features["list_limit"]." ";
- $result_limit = $db->query($query_limit);
- $numrows_limit = $db->numrows($result_limit);
- } else {
- $numrows_limit = $numrows;
- $result_limit = $result;
- }
-
-
- if ($numrows_limit>0) {
- // Produce headline
- echo "<center><table class='tab_cadre'><tr>";
- // Name
- echo "<th>";
- if ($sort=="periph.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=periph.name&order=ASC&start=$start\">";
- echo $lang["peripherals"][5]."</a></th>";
-
- // Manufacturer
- echo "<th>";
- if ($sort=="glpi_enterprises.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_enterprises.name&order=ASC&start=$start\">";
- echo $lang["common"][5]."</a></th>";
-
- // Location
- echo "<th>";
- if ($sort=="glpi_dropdown_locations.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_dropdown_locations.name&order=ASC&start=$start\">";
- echo $lang["peripherals"][6]."</a></th>";
-
- // Type
- echo "<th>";
- if ($sort=="glpi_type_peripherals.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_type_peripherals.name&order=ASC&start=$start\">";
- echo $lang["peripherals"][9]."</a></th>";
-
- // Last modified
- echo "<th>";
- if ($sort=="periph.date_mod") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=periph.date_mod&order=DESC&start=$start\">";
- echo $lang["peripherals"][16]."</a></th>";
-
- // Contact person
- echo "<th>";
- if ($sort=="periph.contact") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=periph.contact&order=ASC&start=$start\">";
- echo $lang["peripherals"][8]."</a></th>";
-
- echo "</tr>";
-
- for ($i=0; $i < $numrows_limit; $i++) {
- $ID = $db->result($result_limit, $i, "ID");
- $mon = new Peripheral;
- $mon->getfromDB($ID);
- echo "<tr class='tab_bg_2'>";
- echo "<td><b>";
- echo "<a href=\"".$cfg_install["root"]."/peripherals/peripherals-info-form.php?ID=$ID\">";
- echo $mon->fields["name"]." (".$mon->fields["ID"].")";
- echo "</a></b></td>";
- echo "<td>". getDropdownName("glpi_enterprises",$mon->fields["FK_glpi_enterprise"]) ."</td>";
- echo "<td>". getDropdownName("glpi_dropdown_locations",$mon->fields["location"]) ."</td>";
- echo "<td>". getDropdownName("glpi_type_peripherals",$mon->fields["type"]) ."</td>";
- echo "<td>".$mon->fields["date_mod"]."</td>";
- echo "<td>".$mon->fields["contact"]."</td>";
- echo "</tr>";
- }
-
- // Close Table
- echo "</table></center>";
-
- // Pager
- $parameters="field=$field&phrasetype=$phrasetype&contains=$contains&sort=$sort&order=$order";
- printPager($start,$numrows,$target,$parameters);
-
- } else {
- echo "<center><b>".$lang["peripherals"][17]."</b></center>";
- //echo "<hr noshade>";
- //searchFormperipheral();
- }
- }
-}
-
-
-function showperipheralForm ($target,$ID) {
-
- GLOBAL $cfg_install, $cfg_layout, $lang,$HTMLRel;
-
- $mon = new Peripheral;
-
- echo "<center><form method='post' name=form action=\"$target\">";
- echo "<table class='tab_cadre' cellpadding='2'>";
- echo "<tr><th colspan='2'><b>";
- if (empty($ID)) {
- echo $lang["peripherals"][3].":";
- $mon->getEmpty();
- } else {
- $mon->getfromDB($ID);
- echo $lang["peripherals"][4]." ID $ID:";
- }
- echo "</b></th></tr>";
-
- echo "<tr><td class='tab_bg_1' valign='top'>";
-
- echo "<table cellpadding='1px' cellspacing='0' border='0'>\n";
-
- echo "<tr><td>".$lang["peripherals"][5].": </td>";
- echo "<td><input type='text' name='name' value=\"".$mon->fields["name"]."\" size='20'></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["peripherals"][6].": </td><td>";
- dropdownValue("glpi_dropdown_locations", "location", $mon->fields["location"]);
- echo "</td></tr>";
-
- echo "<tr><td>".$lang["peripherals"][7].": </td>";
- echo "<td><input type='text' name='contact_num' value=\"".$mon->fields["contact_num"]."\" size='20'></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["peripherals"][8].": </td>";
- echo "<td><input type='text' name='contact' size='20' value=\"".$mon->fields["contact"]."\"></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["peripherals"][29].": </td><td>";
- dropdownValue("glpi_contacts", "tech_num", $mon->fields["tech_num"]);
- echo "</td></tr>";
-
- if (!empty($ID)){
- echo "<tr><td>".$lang["reservation"][24].":</td><td><b>";
- showReservationForm(5,$ID);
- echo "</b></td></tr>";
- }
-
- echo "</table>";
-
- echo "</td>\n";
- echo "<td class='tab_bg_1' valign='top'>";
-
- echo "<table cellpadding='1px' cellspacing='0' border='0'>";
-
- echo "<tr><td>".$lang["peripherals"][9].": </td><td>";
- dropdownValue("glpi_type_peripherals", "type", $mon->fields["type"]);
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_1'><td>".$lang["common"][5].": </td><td colspan='2'>";
- dropdownValue("glpi_enterprises","FK_glpi_enterprise",$mon->fields["FK_glpi_enterprise"]);
- echo "</td></tr>";
-
- echo "<tr><td>".$lang["peripherals"][18].":</td>";
- echo "<td><input type='text' size='20' name='brand' value=\"".$mon->fields["brand"]."\"></td>";
- echo "</tr>";
-
-
- echo "<tr><td>".$lang["peripherals"][10].": </td>";
- echo "<td><input type='text' name='serial' size='20' value=\"".$mon->fields["serial"]."\"></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["peripherals"][11].":</td>";
- echo "<td><input type='text' size='20' name='otherserial' value=\"".$mon->fields["otherserial"]."\"></td>";
- echo "</tr>";
-
-
-echo "</td></tr>";
-
- echo "</table>";
- echo "</td>\n";
- echo "</tr>";
- echo "<tr>";
- echo "<td class='tab_bg_1' valign='top' colspan='2'>";
-
- echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'><tr><td valign='top'>";
- echo $lang["peripherals"][12].": </td>";
- echo "<td align='center'><textarea cols='35' rows='4' name='comments' >".$mon->fields["comments"]."</textarea>";
- echo "</td></tr></table>";
-
- echo "</td>";
- echo "</tr>";
-
- if ($ID=="") {
-
- echo "<tr>";
- echo "<td class='tab_bg_2' valign='top' colspan='2'>";
- echo "<center><input type='submit' name='add' value=\"".$lang["buttons"][8]."\" class='submit'></center>";
- echo "</td>";
- echo "</form></tr>";
-
- echo "</table></center>";
-
- } else {
-
- echo "<tr>";
- echo "<td class='tab_bg_2' valign='top'>";
- echo "<input type='hidden' name='ID' value=\"$ID\">\n";
- echo "<center><input type='submit' name='update' value=\"".$lang["buttons"][7]."\" class='submit' class='submit'></center>";
- echo "</td></form>\n\n";
- echo "<form action=\"$target\" method='post'>\n";
- echo "<td class='tab_bg_2' valign='top'>\n";
- echo "<input type='hidden' name='ID' value=\"$ID\">\n";
- echo "<div align='center'>";
- if ($mon->fields["deleted"]=='N')
- echo "<input type='submit' name='delete' value=\"".$lang["buttons"][6]."\" class='submit'>";
- else {
- echo "<input type='submit' name='restore' value=\"".$lang["buttons"][21]."\" class='submit'>";
-
- echo " <input type='submit' name='purge' value=\"".$lang["buttons"][22]."\" class='submit'>";
- }
- echo "</div>";
- echo "</td>";
- echo "</form></tr>";
-
- echo "</table></center>";
-
- showConnect($target,$ID,PERIPHERAL_TYPE);
- }
-}
-
-
-function updatePeripheral($input) {
- // Update a Peripheral in the database
-
- $mon = new Peripheral;
- $mon->getFromDB($input["ID"]);
-
- // set new date and make sure it gets updated
- $updates[0]= "date_mod";
- $mon->fields["date_mod"] = date("Y-m-d H:i:s");
-
- // Pop off the last two attributes, no longer needed
- $null=array_pop($input);
- $null=array_pop($input);
-
- // Get all flags and fill with 0 if unchecked in form
- foreach ($mon->fields as $key => $val) {
- if (eregi("\.*flag\.*",$key)) {
- if (!isset($input[$key])) {
- $input[$key]=0;
- }
- }
- }
-
- // Fill the update-array with changes
- $x=1;
- foreach ($input as $key => $val) {
- if ($mon->fields[$key] != $input[$key]) {
- $mon->fields[$key] = $input[$key];
- $updates[$x] = $key;
- $x++;
- }
- }
-
- $mon->updateInDB($updates);
-
-}
-
-function addPeripheral($input) {
- // Add Peripheral, nasty hack until we get PHP4-array-functions
-
- $mon = new Peripheral;
-
- // dump status
- $null = array_pop($input);
-
- // fill array for udpate
- foreach ($input as $key => $val) {
- if (!isset($mon->fields[$key]) || $mon->fields[$key] != $input[$key]) {
- $mon->fields[$key] = $input[$key];
- }
- }
-
- $mon->addToDB();
-
-}
-
-function deletePeripheral($input,$force=0) {
- // Delete Printer
-
- $mon = new Peripheral;
- $mon->deleteFromDB($input["ID"],$force);
-
-}
-
-function restorePeripheral($input) {
- // Restore Peripheral
-
- $ct = new Peripheral;
- $ct->restoreInDB($input["ID"]);
-}
-
-?>
diff -Nur web/glpi/glpi/glpi/peripherals/_relpos.php glpi/glpi/peripherals/_relpos.php
--- web/glpi/glpi/glpi/peripherals/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/peripherals/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/printers/classes.php glpi/glpi/printers/classes.php
--- web/glpi/glpi/glpi/printers/classes.php 2005-03-07 09:57:35.000000000 +0100
+++ glpi/glpi/printers/classes.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/printers/CVS/Entries glpi/glpi/printers/CVS/Entries
--- web/glpi/glpi/glpi/printers/CVS/Entries 2005-03-07 09:57:35.000000000 +0100
+++ glpi/glpi/printers/CVS/Entries 2005-03-07 14:02:52.000000000 +0100
@@ -1,4 +1,4 @@
-/_relpos.php/1.4/Sat Feb 12 16:00:10 2005//
-/classes.php/1.20/Mon Mar 7 08:57:35 2005//
-/functions.php/1.54/Result of merge+Mon Mar 7 08:57:35 2005//
+/_relpos.php/1.5/Mon Mar 7 10:44:25 2005//
+/classes.php/1.21/Mon Mar 7 10:44:25 2005//
+/functions.php/1.56/Mon Mar 7 11:02:39 2005//
D
diff -Nur web/glpi/glpi/glpi/printers/functions.php glpi/glpi/printers/functions.php
--- web/glpi/glpi/glpi/printers/functions.php 2005-03-07 11:17:38.000000000 +0100
+++ glpi/glpi/printers/functions.php 2005-03-07 12:02:39.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
@@ -46,7 +47,7 @@
echo "<img src=\"".$HTMLRel."pics/printer.png\" alt='".$lang["printers"][0]."' title='".$lang["printers"][0]."'></td><td><a class='icon_consol' href=\"printers-add-select.php\"><b>".$lang["printers"][0]."</b></a>";
echo "</td>";
- echo "<td><a href='".$HTMLRel."setup/setup-templates.php?type=".PRINTER_TYPE."'>".$lang["common"][8]."</a></td>";
+ echo "<td><a class='icon_consol' href='".$HTMLRel."setup/setup-templates.php?type=".PRINTER_TYPE."'>".$lang["common"][9]."</a></td>";
echo "</tr></table></div>";
}
@@ -346,17 +347,7 @@
echo "<tr><td>".$lang["printers"][8].": </td>";
echo "<td><input type='text' name='contact' size='20' value=\"".$printer->fields["contact"]."\"></td>";
echo "</tr>";
-//<<<<<<< functions.php
-
- echo "<tr><td>".$lang["printers"][30].": </td><td>";
- dropdownValue("glpi_contacts", "tech_num", $printer->fields["tech_num"]);
- echo "</td></tr>";
-/*
- if (!empty($ID)){
-=======*/
- echo $template;
if (!$template){
-//>>>>>>> 1.54
echo "<tr><td>".$lang["reservation"][24].":</td><td><b>";
showReservationForm(PRINTER_TYPE,$ID);
echo "</b></td></tr>";
diff -Nur web/glpi/glpi/glpi/printers/functions.php~ glpi/glpi/printers/functions.php~
--- web/glpi/glpi/glpi/printers/functions.php~ 2005-03-07 11:16:50.000000000 +0100
+++ glpi/glpi/printers/functions.php~ 1970-01-01 01:00:00.000000000 +0100
@@ -1,609 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
-*/
-
-// Based on:
-// IRMA, Information Resource-Management and Administration
-// Christian Bauer
-// ----------------------------------------------------------------------
-// Original Author of file:
-// Purpose of file:
-// ----------------------------------------------------------------------
-
-include ("_relpos.php");
-// FUNCTIONS Printers
-//fonction imprimantes
-
-function titlePrinters(){
- GLOBAL $lang,$HTMLRel;
-
- echo "<div align='center'><table border='0'><tr><td>";
-
- echo "<img src=\"".$HTMLRel."pics/printer.png\" alt='".$lang["printers"][0]."' title='".$lang["printers"][0]."'></td><td><a class='icon_consol' href=\"printers-add-select.php\"><b>".$lang["printers"][0]."</b></a>";
-
- echo "</td>";
- echo "<td><a href='".$HTMLRel."setup/setup-templates.php?type=".PRINTER_TYPE."'>".$lang["common"][8]."</a></td>";
- echo "</tr></table></div>";
-}
-
-
-
-function searchFormPrinters($field="",$phrasetype= "",$contains="",$sort= "",$deleted="") {
- // Print Search Form
-
- GLOBAL $cfg_install, $cfg_layout, $layout, $lang,$HTMLRel;
-
- $option["printer.name"] = $lang["printers"][5];
- $option["printer.ID"] = $lang["printers"][19];
- $option["glpi_dropdown_locations.name"] = $lang["printers"][6];
- $option["glpi_type_printers.name"] = $lang["printers"][9];
- $option["printer.serial"] = $lang["printers"][10];
- $option["printer.otherserial"] = $lang["printers"][11] ;
- $option["printer.comments"] = $lang["printers"][12];
- $option["printer.contact"] = $lang["printers"][8];
- $option["printer.contact_num"] = $lang["printers"][7];
- $option["printer.date_mod"] = $lang["printers"][16];
- $option["glpi_networking_ports.ifaddr"] = $lang["networking"][14];
- $option["glpi_networking_ports.ifmac"] = $lang["networking"][15];
- $option["glpi_dropdown_netpoint.name"] = $lang["networking"][51];
- $option["glpi_enterprises.name"] = $lang["common"][5];
-
- echo "<form method='get' action=\"".$cfg_install["root"]."/printers/printers-search.php\">";
- echo "<div align='center'><table width='750' class='tab_cadre'>";
- echo "<tr><th colspan='3'><b>".$lang["search"][0].":</b></th></tr>";
- echo "<tr class='tab_bg_1'>";
- echo "<td align='center'>";
- echo "<input type='text' size='15' name=\"contains\" value=\"". $contains ."\" >";
- echo " ";
- echo $lang["search"][10]." ";
-
- echo "<select name=\"field\" size='1'>";
- echo "<option value='all' ";
- if($field == "all") echo "selected";
- echo ">".$lang["search"][7]."</option>";
- reset($option);
- foreach ($option as $key => $val) {
- echo "<option value=\"".$key."\"";
- if($key == $field) echo "selected";
- echo ">". $val ."</option>\n";
- }
- echo "</select> ";
-
- /*
- echo $lang["search"][1];
- echo " <select name='phrasetype' size='1' >";
- echo "<option value='contains'";
- if($phrasetype == "contains") echo "selected";
- echo ">".$lang["search"][2]."</option>";
- echo "<option value='exact'";
- if($phrasetype == "exact") echo "selected";
- echo ">".$lang["search"][3]."</option>";
- echo "</select>";
- */
-
- echo $lang["search"][4];
- echo " <select name='sort' size='1'>";
- reset($option);
- foreach ($option as $key => $val) {
- echo "<option value=\"".$key."\"";
- if($key == $sort) echo "selected";
- echo ">".$val."</option>\n";
- }
- echo "</select> ";
- echo "</td><td><input type='checkbox' name='deleted' ".($deleted=='Y'?" checked ":"").">";
- echo "<img src=\"".$HTMLRel."pics/showdeleted.png\" alt='".$lang["common"][3]."' title='".$lang["common"][3]."'>";
- echo "</td><td width='80' align='center' class='tab_bg_2'>";
- echo "<input type='submit' value=\"".$lang["buttons"][0]."\" class='submit'>";
- echo "</td></tr></table></div></form>";
-}
-
-
-function showPrintersList($target,$username,$field,$phrasetype,$contains,$sort,$order,$start,$deleted) {
-
- // Lists Printers
-
- GLOBAL $cfg_install, $cfg_layout, $cfg_features, $lang, $HTMLRel;
-
- $db = new DB;
- // Build query
- if($field=="all") {
- $where = " (";
- $fields = $db->list_fields("glpi_printers");
- $columns = $db->num_fields($fields);
-
- for ($i = 0; $i < $columns; $i++) {
- if($i != 0) {
- $where .= " OR ";
- }
- $coco = mysql_field_name($fields, $i);
-
- if($coco == "location") {
- $where .= " glpi_dropdown_locations.name LIKE '%".$contains."%'";
- }
- elseif($coco == "type") {
- $where .= " glpi_type_printers.name LIKE '%".$contains."%'";
- }
- else {
- $where .= "printer.".$coco . " LIKE '%".$contains."%'";
- }
- }
- $where .= " OR glpi_networking_ports.ifaddr LIKE '%".$contains."%'";
- $where .= " OR glpi_networking_ports.ifmac LIKE '%".$contains."%'";
- $where .= " OR glpi_dropdown_netpoint.name LIKE '%".$contains."%'";
- $where.=" OR glpi_enterprises.name LIKE '%".$contains."%'";
- $where .= ")";
- }
- else {
- if ($phrasetype == "contains") {
- $where = "($field LIKE '%".$contains."%')";
- }
- else {
- $where = "($field LIKE '".$contains."')";
- }
- }
-
- if (!$start) {
- $start = 0;
- }
- if (!$order) {
- $order = "ASC";
- }
- $query = "select DISTINCT printer.ID from glpi_printers as printer LEFT JOIN glpi_dropdown_locations on printer.location=glpi_dropdown_locations.ID ";
- $query .= "LEFT JOIN glpi_type_printers on printer.type = glpi_type_printers.ID ";
- $query .= "LEFT JOIN glpi_networking_ports on (printer.ID = glpi_networking_ports.on_device AND glpi_networking_ports.device_type='3')";
- $query .= "LEFT JOIN glpi_dropdown_netpoint on (glpi_dropdown_netpoint.ID = glpi_networking_ports.netpoint)";
- $query.= " LEFT JOIN glpi_enterprises ON (glpi_enterprises.ID = printer.FK_glpi_enterprise ) ";
- $query .= "where $where AND printer.deleted='$deleted' AND printer.is_template = '0' ORDER BY $sort $order";
-
-// echo $query;
- // Get it from database
- if ($result = $db->query($query)) {
- $numrows = $db->numrows($result);
-
- // Limit the result, if no limit applies, use prior result
- if ($numrows>$cfg_features["list_limit"]) {
- $query_limit = $query ." LIMIT $start,".$cfg_features["list_limit"]." ";
- $result_limit = $db->query($query_limit);
- $numrows_limit = $db->numrows($result_limit);
-
- } else {
- $numrows_limit = $numrows;
- $result_limit = $result;
- }
-
-
- if ($numrows_limit>0) {
- // Produce headline
- echo "<center><table class='tab_cadre'><tr>";
-
- // Name
- echo "<th>";
- if ($sort=="printer.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=printer.name&order=ASC&start=$start\">";
- echo $lang["printers"][5]."</a></th>";
-
- // Manufacturer
- echo "<th>";
- if ($sort=="glpi_enterprises.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_enterprises.name&order=ASC&start=$start\">";
- echo $lang["common"][5]."</a></th>";
-
- // Location
- echo "<th>";
- if ($sort=="glpi_dropdown_locations.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_dropdown_locations.name&order=ASC&start=$start\">";
- echo $lang["printers"][6]."</a></th>";
-
- // Type
- echo "<th>";
- if ($sort=="glpi_type_printers.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_type_printers.name&order=ASC&start=$start\">";
- echo $lang["printers"][9]."</a></th>";
-
- // Last modified
- echo "<th>";
- if ($sort=="printer.date_mod") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=printer.date_mod&order=DESC&start=$start\">";
- echo $lang["printers"][16]."</a></th>";
-
- echo "</tr>";
-
- for ($i=0; $i < $numrows_limit; $i++) {
- $ID = $db->result($result_limit, $i, "ID");
- $printer = new Printer;
- $printer->getfromDB($ID);
- echo "<tr class='tab_bg_2'>";
- echo "<td><b>";
- echo "<a href=\"".$cfg_install["root"]."/printers/printers-info-form.php?ID=$ID\">";
- echo $printer->fields["name"]." (".$printer->fields["ID"].")";
- echo "</a></b></td>";
- echo "<td>". getDropdownName("glpi_enterprises",$printer->fields["FK_glpi_enterprise"]) ."</td>";
- echo "<td>". getDropdownName("glpi_dropdown_locations",$printer->fields["location"]) ."</td>";
- echo "<td>". getDropdownName("glpi_type_printers",$printer->fields["type"]) ."</td>";
- echo "<td>".$printer->fields["date_mod"]."</td>";
- echo "</tr>";
- }
-
- // Close Table
- echo "</table></center>";
-
- // Pager
- $parameters="field=$field&phrasetype=$phrasetype&contains=$contains&sort=$sort&order=$order";
- printPager($start,$numrows,$target,$parameters);
-
- } else {
- echo "<center><b>".$lang["printers"][17]."</b></center>";
- echo "<hr noshade>";
- }
- }
-}
-
-
-function showPrintersForm ($target,$ID,$withtemplate='') {
-
- GLOBAL $cfg_install, $cfg_layout, $lang,$HTMLRel;
-
- $printer = new Printer;
-
- $printer_spotted = false;
-
- if(empty($ID) && $withtemplate == 1) {
- if($printer->getEmpty()) $printer_spotted = true;
- } else {
- if($printer->getfromDB($ID)) $printer_spotted = true;
- }
-
- if($printer_spotted) {
- if(!empty($withtemplate) && $withtemplate == 2) {
- $template = "newcomp";
- $datestring = $lang["computers"][14].": ";
- $date = date("Y-m-d H:i:s");
- } elseif(!empty($withtemplate) && $withtemplate == 1) {
- $template = "newtemplate";
- $datestring = $lang["computers"][14].": ";
- $date = date("Y-m-d H:i:s");
- } else {
- $datestring = $lang["computers"][11]." : ";
- $date = $printer->fields["date_mod"];
- $template = false;
- }
-
-
- echo "<div align='center'><form method='post' name='form' action=\"$target\">";
- if(strcmp($template,"newtemplate") === 0) {
- echo "<input type=\"hidden\" name=\"is_template\" value=\"1\" />";
- }
-
- echo "<table class='tab_cadre' cellpadding='2'>";
-
- echo "<tr><th align='center' >";
- if(!$template) {
- echo $lang["printers"][29].": ".$printer->fields["ID"];
- }elseif (strcmp($template,"newcomp") === 0) {
- echo $lang["printers"][28].": ".$printer->fields["tplname"];
- }elseif (strcmp($template,"newtemplate") === 0) {
- echo $lang["common"][6]." : <input type='text' name='tplname' value=\"".$printer->fields["tplname"]."\" size='20'>";
- }
-
- echo "</th><th align='center'>".$datestring.$date;
- echo "</th></tr>";
-
-
- echo "<tr><td class='tab_bg_1' valign='top'>";
-
- // table identification
- echo "<table cellpadding='1px' cellspacing='0' border='0'>\n";
- echo "<tr><td>".$lang["printers"][5].": </td>";
- echo "<td><input type='text' name='name' value=\"".$printer->fields["name"]."\" size='20'></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["printers"][6].": </td><td>";
- dropdownValue("glpi_dropdown_locations", "location", $printer->fields["location"]);
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_1'><td>".$lang["common"][5].": </td><td colspan='2'>";
- dropdownValue("glpi_enterprises","FK_glpi_enterprise",$printer->fields["FK_glpi_enterprise"]);
- echo "</td></tr>";
-
- echo "<tr><td>".$lang["printers"][7].": </td>";
- echo "<td><input type='text' name='contact_num' value=\"".$printer->fields["contact_num"]."\" size='20'></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["printers"][8].": </td>";
- echo "<td><input type='text' name='contact' size='20' value=\"".$printer->fields["contact"]."\"></td>";
- echo "</tr>";
-//<<<<<<< functions.php
-
- echo "<tr><td>".$lang["printers"][28].": </td><td>";
- dropdownValue("glpi_contacts", "tech_num", $printer->fields["tech_num"]);
- echo "</td></tr>";
-/*
- if (!empty($ID)){
-=======*/
- echo $template;
- if (!$template){
-//>>>>>>> 1.54
- echo "<tr><td>".$lang["reservation"][24].":</td><td><b>";
- showReservationForm(PRINTER_TYPE,$ID);
- echo "</b></td></tr>";
- }
- echo "</table>"; // fin table indentification
-
- echo "</td>\n";
- echo "<td class='tab_bg_1' valign='top'>";
-
- // table type,serial..
- echo "<table cellpadding='1px' cellspacing='0' border='0'>";
-
- echo "<tr><td>".$lang["printers"][9].": </td><td>";
- dropdownValue("glpi_type_printers", "type", $printer->fields["type"]);
- echo "</td></tr>";
-
- echo "<tr><td>".$lang["printers"][10].": </td>";
- echo "<td><input type='text' name='serial' size='20' value=\"".$printer->fields["serial"]."\"></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["printers"][11].":</td>";
- echo "<td><input type='text' size='20' name='otherserial' value=\"".$printer->fields["otherserial"]."\"></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["printers"][18].": </td><td>";
-
- // serial interface?
- echo "<table border='0' cellpadding='2' cellspacing='0'><tr>";
- echo "<td>";
- if ($printer->fields["flags_serial"] == 1) {
- echo "<input type='checkbox' name='flags_serial' value='1' checked>";
- } else {
- echo "<input type='checkbox' name='flags_serial' value='1'>";
- }
- echo "</td><td>".$lang["printers"][14]."</td>";
- echo "</tr></table>";
-
- // parallel interface?
- echo "<table border='0' cellpadding='2' cellspacing='0'><tr>";
- echo "<td>";
- if ($printer->fields["flags_par"] == 1) {
- echo "<input type='checkbox' name='flags_par' value='1' checked>";
- } else {
- echo "<input type='checkbox' name='flags_par' value='1'>";
- }
- echo "</td><td>".$lang["printers"][15]."</td>";
- echo "</tr></table>";
-
- // USB ?
- echo "<table border='0' cellpadding='2' cellspacing='0'><tr>";
- echo "<td>";
- if ($printer->fields["flags_usb"] == 1) {
- echo "<input type='checkbox' name='flags_usb' value='1' checked>";
- } else {
- echo "<input type='checkbox' name='flags_usb' value='1'>";
- }
- echo "</td><td>".$lang["printers"][27]."</td>";
- echo "</tr></table>";
-
- // Ram ?
- echo "<tr><td>".$lang["printers"][23].":</td>";
- echo "<td><input type='text' size='12' name='ramSize' value=\"".$printer->fields["ramSize"]."\"></td>";
- echo "</tr>";
-
- echo "</td></tr>";
-
- echo "</table>";
- echo "</td>\n";
- echo "</tr>";
-
- echo "<tr>";
- echo "<td class='tab_bg_1' valign='top' colspan='2'>";
-
- // table commentaires
- echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'><tr><td valign='top'>";
- echo $lang["printers"][12].": </td>";
- echo "<td align='center'><textarea cols='35' rows='4' name='comments' >".$printer->fields["comments"]."</textarea>";
- echo "</td></tr></table>";
-
- echo "</td>";
- echo "</tr>";
-
- echo "<tr>";
-
- if ($template) {
-
- if (empty($ID)||$withtemplate==2){
- echo "<td class='tab_bg_2' align='center' colspan='2'>\n";
- echo "<input type='hidden' name='ID' value=$ID>";
- echo "<input type='submit' name='add' value=\"".$lang["buttons"][8]."\" class='submit'>";
- echo "</td>\n";
- } else {
- echo "<td class='tab_bg_2' align='center' colspan='2'>\n";
- echo "<input type='hidden' name='ID' value=$ID>";
- echo "<input type='submit' name='update' value=\"".$lang["buttons"][7]."\" class='submit'>";
- echo "</td>\n";
- }
-
-
- } else {
-
- echo "<td class='tab_bg_2' valign='top' align='center'>";
- echo "<input type='hidden' name='ID' value=\"$ID\">\n";
- echo "<input type='submit' name='update' value=\"".$lang["buttons"][7]."\" class='submit'>";
- echo "</td></form>\n\n";
- echo "<form action=\"$target\" method='post'>\n";
- echo "<td class='tab_bg_2' valign='top' align='center'>\n";
- echo "<input type='hidden' name='ID' value=\"$ID\">\n";
- echo "<div align='center'>";
- if ($printer->fields["deleted"]=='N')
- echo "<input type='submit' name='delete' value=\"".$lang["buttons"][6]."\" class='submit'>";
- else {
- echo "<input type='submit' name='restore' value=\"".$lang["buttons"][21]."\" class='submit'>";
-
- echo " <input type='submit' name='purge' value=\"".$lang["buttons"][22]."\" class='submit'>";
- }
- echo "</div>";
- echo "</td>";
-
- }
- echo "</form></tr>";
-
- echo "</table></div>";
-
- return true;
- }
- else {
- echo "<div align='center'><b>".$lang["printers"][17]."</b></div>";
- echo "<hr noshade>";
- searchFormPrinters();
- return false;
- }
-
-}
-
-
-function updatePrinter($input) {
- // Update a printer in the database
-
- $printer = new Printer;
- $printer->getFromDB($input["ID"]);
-
- // set new date and make sure it gets updated
- $updates[0]= "date_mod";
- $printer->fields["date_mod"] = date("Y-m-d H:i:s");
-
- // Pop off the last two attributes, no longer needed
- $null=array_pop($input);
- $null=array_pop($input);
-
- // Get all flags and fill with 0 if unchecked in form
- foreach ($printer->fields as $key => $val) {
- if (eregi("\.*flag\.*",$key)) {
- if (!isset($input[$key])) {
- $input[$key]=0;
- }
- }
- }
-
- // Fill the update-array with changes
- $x=1;
- foreach ($input as $key => $val) {
- if ($printer->fields[$key] != $input[$key]) {
- $printer->fields[$key] = $input[$key];
- $updates[$x] = $key;
- $x++;
- }
- }
-
- $printer->updateInDB($updates);
-
-}
-
-function addPrinter($input) {
- // Add Printer, nasty hack until we get PHP4-array-functions
- $db=new DB;
- $printer = new Printer;
-
- // dump status
- $oldID=$input["ID"];
-
- $null = array_pop($input);
- $null = array_pop($input);
-
- // set new date.
- $printer->fields["date_mod"] = date("Y-m-d H:i:s");
-
- // fill array for update
- foreach ($input as $key => $val) {
- if (empty($printer->fields[$key]) || $printer->fields[$key] != $input[$key]) {
- $printer->fields[$key] = $input[$key];
- }
- }
-
- $printer->addToDB();
- $newID=$printer->getInsertElementID();
-
- // ADD Infocoms
- $ic= new Infocom();
- if ($ic->getFromDB(PRINTER_TYPE,$oldID)){
- $ic->fields["FK_device"]=$newID;
- unset ($ic->fields["ID"]);
- $ic->addToDB();
- }
-
- // ADD Ports
- $query="SELECT ID from glpi_networking_ports WHERE on_device='$oldID' AND device_type='".PRINTER_TYPE."';";
- $result=$db->query($query);
- if ($db->numrows($result)>0){
-
- while ($data=$db->fetch_array($result)){
- $np= new Netport();
- $np->getFromDB($data["ID"]);
- unset($np->fields["ID"]);
- unset($np->fields["ifaddr"]);
- unset($np->fields["ifmac"]);
- unset($np->fields["netpoint"]);
- $np->fields["on_device"]=$newID;
- $np->addToDB();
- }
- }
-
- // ADD Contract
- $query="SELECT FK_contract from glpi_contract_device WHERE FK_device='$oldID' AND device_type='".PRINTER_TYPE."';";
- $result=$db->query($query);
- if ($db->numrows($result)>0){
-
- while ($data=$db->fetch_array($result))
- addDeviceContract($data["FK_contract"],PRINTER_TYPE,$newID);
- }
-
-
-}
-
-function deletePrinter($input,$force=0) {
- // Delete Printer
-
- $printer = new Printer;
- $printer->deleteFromDB($input["ID"],$force);
-
-}
-
-function restorePrinter($input) {
- // Restore Printer
-
- $ct = new Printer;
- $ct->restoreInDB($input["ID"]);
-}
-
-?>
diff -Nur web/glpi/glpi/glpi/printers/.#functions.php.1.48 glpi/glpi/printers/.#functions.php.1.48
--- web/glpi/glpi/glpi/printers/.#functions.php.1.48 2005-03-04 12:33:26.000000000 +0100
+++ glpi/glpi/printers/.#functions.php.1.48 1970-01-01 01:00:00.000000000 +0100
@@ -1,518 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
-*/
-
-// Based on:
-// IRMA, Information Resource-Management and Administration
-// Christian Bauer
-// ----------------------------------------------------------------------
-// Original Author of file:
-// Purpose of file:
-// ----------------------------------------------------------------------
-
-include ("_relpos.php");
-// FUNCTIONS Printers
-//fonction imprimantes
-
-function titlePrinters(){
- GLOBAL $lang,$HTMLRel;
-
- echo "<div align='center'><table border='0'><tr><td>";
-
- echo "<img src=\"".$HTMLRel."pics/printer.png\" alt='".$lang["printers"][0]."' title='".$lang["printers"][0]."'></td><td><a class='icon_consol' href=\"printers-info-form.php?new=1\"><b>".$lang["printers"][0]."</b></a>";
-
-
- echo "</td></tr></table></div>";
-}
-
-
-
-function searchFormPrinters($field="",$phrasetype= "",$contains="",$sort= "",$deleted="") {
- // Print Search Form
-
- GLOBAL $cfg_install, $cfg_layout, $layout, $lang,$HTMLRel;
-
- $option["printer.name"] = $lang["printers"][5];
- $option["printer.ID"] = $lang["printers"][19];
- $option["glpi_dropdown_locations.name"] = $lang["printers"][6];
- $option["glpi_type_printers.name"] = $lang["printers"][9];
- $option["printer.serial"] = $lang["printers"][10];
- $option["printer.otherserial"] = $lang["printers"][11] ;
- $option["printer.comments"] = $lang["printers"][12];
- $option["printer.contact"] = $lang["printers"][8];
- $option["printer.contact_num"] = $lang["printers"][7];
- $option["printer.date_mod"] = $lang["printers"][16];
- $option["glpi_networking_ports.ifaddr"] = $lang["networking"][14];
- $option["glpi_networking_ports.ifmac"] = $lang["networking"][15];
- $option["glpi_dropdown_netpoint.name"] = $lang["networking"][51];
- $option["glpi_enterprises.name"] = $lang["common"][5];
-
- echo "<form method='get' action=\"".$cfg_install["root"]."/printers/printers-search.php\">";
- echo "<div align='center'><table width='750' class='tab_cadre'>";
- echo "<tr><th colspan='3'><b>".$lang["search"][0].":</b></th></tr>";
- echo "<tr class='tab_bg_1'>";
- echo "<td align='center'>";
- echo "<input type='text' size='15' name=\"contains\" value=\"". $contains ."\" >";
- echo " ";
- echo $lang["search"][10]." ";
-
- echo "<select name=\"field\" size='1'>";
- echo "<option value='all' ";
- if($field == "all") echo "selected";
- echo ">".$lang["search"][7]."</option>";
- reset($option);
- foreach ($option as $key => $val) {
- echo "<option value=\"".$key."\"";
- if($key == $field) echo "selected";
- echo ">". $val ."</option>\n";
- }
- echo "</select> ";
-
- /*
- echo $lang["search"][1];
- echo " <select name='phrasetype' size='1' >";
- echo "<option value='contains'";
- if($phrasetype == "contains") echo "selected";
- echo ">".$lang["search"][2]."</option>";
- echo "<option value='exact'";
- if($phrasetype == "exact") echo "selected";
- echo ">".$lang["search"][3]."</option>";
- echo "</select>";
- */
-
- echo $lang["search"][4];
- echo " <select name='sort' size='1'>";
- reset($option);
- foreach ($option as $key => $val) {
- echo "<option value=\"".$key."\"";
- if($key == $sort) echo "selected";
- echo ">".$val."</option>\n";
- }
- echo "</select> ";
- echo "</td><td><input type='checkbox' name='deleted' ".($deleted=='Y'?" checked ":"").">";
- echo "<img src=\"".$HTMLRel."pics/showdeleted.png\" alt='".$lang["common"][3]."' title='".$lang["common"][3]."'>";
- echo "</td><td width='80' align='center' class='tab_bg_2'>";
- echo "<input type='submit' value=\"".$lang["buttons"][0]."\" class='submit'>";
- echo "</td></tr></table></div></form>";
-}
-
-
-function showPrintersList($target,$username,$field,$phrasetype,$contains,$sort,$order,$start,$deleted) {
-
- // Lists Printers
-
- GLOBAL $cfg_install, $cfg_layout, $cfg_features, $lang, $HTMLRel;
-
- $db = new DB;
- // Build query
- if($field=="all") {
- $where = " (";
- $fields = $db->list_fields("glpi_printers");
- $columns = $db->num_fields($fields);
-
- for ($i = 0; $i < $columns; $i++) {
- if($i != 0) {
- $where .= " OR ";
- }
- $coco = mysql_field_name($fields, $i);
-
- if($coco == "location") {
- $where .= " glpi_dropdown_locations.name LIKE '%".$contains."%'";
- }
- elseif($coco == "type") {
- $where .= " glpi_type_printers.name LIKE '%".$contains."%'";
- }
- else {
- $where .= "printer.".$coco . " LIKE '%".$contains."%'";
- }
- }
- $where .= " OR glpi_networking_ports.ifaddr LIKE '%".$contains."%'";
- $where .= " OR glpi_networking_ports.ifmac LIKE '%".$contains."%'";
- $where .= " OR glpi_dropdown_netpoint.name LIKE '%".$contains."%'";
- $where.=" OR glpi_enterprises.name LIKE '%".$contains."%'";
- $where .= ")";
- }
- else {
- if ($phrasetype == "contains") {
- $where = "($field LIKE '%".$contains."%')";
- }
- else {
- $where = "($field LIKE '".$contains."')";
- }
- }
-
- if (!$start) {
- $start = 0;
- }
- if (!$order) {
- $order = "ASC";
- }
- $query = "select DISTINCT printer.ID from glpi_printers as printer LEFT JOIN glpi_dropdown_locations on printer.location=glpi_dropdown_locations.ID ";
- $query .= "LEFT JOIN glpi_type_printers on printer.type = glpi_type_printers.ID ";
- $query .= "LEFT JOIN glpi_networking_ports on (printer.ID = glpi_networking_ports.on_device AND glpi_networking_ports.device_type='3')";
- $query .= "LEFT JOIN glpi_dropdown_netpoint on (glpi_dropdown_netpoint.ID = glpi_networking_ports.netpoint)";
- $query.= " LEFT JOIN glpi_enterprises ON (glpi_enterprises.ID = printer.FK_glpi_enterprise ) ";
- $query .= "where $where AND printer.deleted='$deleted' ORDER BY $sort $order";
-
-// echo $query;
- // Get it from database
- if ($result = $db->query($query)) {
- $numrows = $db->numrows($result);
-
- // Limit the result, if no limit applies, use prior result
- if ($numrows>$cfg_features["list_limit"]) {
- $query_limit = $query ." LIMIT $start,".$cfg_features["list_limit"]." ";
- $result_limit = $db->query($query_limit);
- $numrows_limit = $db->numrows($result_limit);
-
- } else {
- $numrows_limit = $numrows;
- $result_limit = $result;
- }
-
-
- if ($numrows_limit>0) {
- // Produce headline
- echo "<center><table class='tab_cadre'><tr>";
-
- // Name
- echo "<th>";
- if ($sort=="printer.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=printer.name&order=ASC&start=$start\">";
- echo $lang["printers"][5]."</a></th>";
-
- // Manufacturer
- echo "<th>";
- if ($sort=="glpi_enterprises.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_enterprises.name&order=ASC&start=$start\">";
- echo $lang["common"][5]."</a></th>";
-
- // Location
- echo "<th>";
- if ($sort=="glpi_dropdown_locations.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_dropdown_locations.name&order=ASC&start=$start\">";
- echo $lang["printers"][6]."</a></th>";
-
- // Type
- echo "<th>";
- if ($sort=="glpi_type_printers.name") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=glpi_type_printers.name&order=ASC&start=$start\">";
- echo $lang["printers"][9]."</a></th>";
-
- // Last modified
- echo "<th>";
- if ($sort=="printer.date_mod") {
- echo "<img src=\"".$HTMLRel."pics/puce-down.gif\" alt='' title=''>";
- }
- echo "<a href=\"$target?field=$field&phrasetype=$phrasetype&contains=$contains&sort=printer.date_mod&order=DESC&start=$start\">";
- echo $lang["printers"][16]."</a></th>";
-
- echo "</tr>";
-
- for ($i=0; $i < $numrows_limit; $i++) {
- $ID = $db->result($result_limit, $i, "ID");
- $printer = new Printer;
- $printer->getfromDB($ID);
- echo "<tr class='tab_bg_2'>";
- echo "<td><b>";
- echo "<a href=\"".$cfg_install["root"]."/printers/printers-info-form.php?ID=$ID\">";
- echo $printer->fields["name"]." (".$printer->fields["ID"].")";
- echo "</a></b></td>";
- echo "<td>". getDropdownName("glpi_enterprises",$printer->fields["FK_glpi_enterprise"]) ."</td>";
- echo "<td>". getDropdownName("glpi_dropdown_locations",$printer->fields["location"]) ."</td>";
- echo "<td>". getDropdownName("glpi_type_printers",$printer->fields["type"]) ."</td>";
- echo "<td>".$printer->fields["date_mod"]."</td>";
- echo "</tr>";
- }
-
- // Close Table
- echo "</table></center>";
-
- // Pager
- $parameters="field=$field&phrasetype=$phrasetype&contains=$contains&sort=$sort&order=$order";
- printPager($start,$numrows,$target,$parameters);
-
- } else {
- echo "<center><b>".$lang["printers"][17]."</b></center>";
- echo "<hr noshade>";
- }
- }
-}
-
-
-function showPrintersForm ($target,$ID) {
-
- GLOBAL $cfg_install, $cfg_layout, $lang,$HTMLRel;
-
- $printer = new Printer;
-
- echo "<div align='center'><form method='post' name='form' action=\"$target\">";
- echo "<table class='tab_cadre' cellpadding='2'>";
- echo "<tr><th colspan='2'><b>";
- if (empty($ID)) {
- echo $lang["printers"][3].":";
- $printer->getEmpty();
- } else {
- $printer->getfromDB($ID);
- echo $lang["printers"][4]." ID $ID:";
- }
- echo "</b></th></tr>";
-
- echo "<tr><td class='tab_bg_1' valign='top'>";
-
- // table identification
- echo "<table cellpadding='1px' cellspacing='0' border='0'>\n";
- echo "<tr><td>".$lang["printers"][5].": </td>";
- echo "<td><input type='text' name='name' value=\"".$printer->fields["name"]."\" size='20'></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["printers"][6].": </td><td>";
- dropdownValue("glpi_dropdown_locations", "location", $printer->fields["location"]);
- echo "</td></tr>";
-
- echo "<tr class='tab_bg_1'><td>".$lang["common"][5].": </td><td colspan='2'>";
- dropdownValue("glpi_enterprises","FK_glpi_enterprise",$printer->fields["FK_glpi_enterprise"]);
- echo "</td></tr>";
-
- echo "<tr><td>".$lang["printers"][7].": </td>";
- echo "<td><input type='text' name='contact_num' value=\"".$printer->fields["contact_num"]."\" size='20'></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["printers"][8].": </td>";
- echo "<td><input type='text' name='contact' size='20' value=\"".$printer->fields["contact"]."\"></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["printers"][28].": </td><td>";
- dropdownValue("glpi_contacts", "tech_num", $printer->fields["tech_num"]);
- echo "</td></tr>";
-
- if (!empty($ID)){
- echo "<tr><td>".$lang["reservation"][24].":</td><td><b>";
- showReservationForm(3,$ID);
- echo "</b></td></tr>";
- }
- echo "</table>"; // fin table indentification
-
- echo "</td>\n";
- echo "<td class='tab_bg_1' valign='top'>";
-
- // table type,serial..
- echo "<table cellpadding='1px' cellspacing='0' border='0'>";
-
- echo "<tr><td>".$lang["printers"][9].": </td><td>";
- dropdownValue("glpi_type_printers", "type", $printer->fields["type"]);
- echo "</td></tr>";
-
- echo "<tr><td>".$lang["printers"][10].": </td>";
- echo "<td><input type='text' name='serial' size='20' value=\"".$printer->fields["serial"]."\"></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["printers"][11].":</td>";
- echo "<td><input type='text' size='20' name='otherserial' value=\"".$printer->fields["otherserial"]."\"></td>";
- echo "</tr>";
-
- echo "<tr><td>".$lang["printers"][18].": </td><td>";
-
- // serial interface?
- echo "<table border='0' cellpadding='2' cellspacing='0'><tr>";
- echo "<td>";
- if ($printer->fields["flags_serial"] == 1) {
- echo "<input type='checkbox' name='flags_serial' value='1' checked>";
- } else {
- echo "<input type='checkbox' name='flags_serial' value='1'>";
- }
- echo "</td><td>".$lang["printers"][14]."</td>";
- echo "</tr></table>";
-
- // parallel interface?
- echo "<table border='0' cellpadding='2' cellspacing='0'><tr>";
- echo "<td>";
- if ($printer->fields["flags_par"] == 1) {
- echo "<input type='checkbox' name='flags_par' value='1' checked>";
- } else {
- echo "<input type='checkbox' name='flags_par' value='1'>";
- }
- echo "</td><td>".$lang["printers"][15]."</td>";
- echo "</tr></table>";
-
- // USB ?
- echo "<table border='0' cellpadding='2' cellspacing='0'><tr>";
- echo "<td>";
- if ($printer->fields["flags_usb"] == 1) {
- echo "<input type='checkbox' name='flags_usb' value='1' checked>";
- } else {
- echo "<input type='checkbox' name='flags_usb' value='1'>";
- }
- echo "</td><td>".$lang["printers"][27]."</td>";
- echo "</tr></table>";
-
- // Ram ?
- echo "<tr><td>".$lang["printers"][23].":</td>";
- echo "<td><input type='text' size='12' name='ramSize' value=\"".$printer->fields["ramSize"]."\"></td>";
- echo "</tr>";
-
- echo "</td></tr>";
-
- echo "</table>";
- echo "</td>\n";
- echo "</tr>";
-
- echo "<tr>";
- echo "<td class='tab_bg_1' valign='top' colspan='2'>";
-
- // table commentaires
- echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'><tr><td valign='top'>";
- echo $lang["printers"][12].": </td>";
- echo "<td align='center'><textarea cols='35' rows='4' name='comments' >".$printer->fields["comments"]."</textarea>";
- echo "</td></tr></table>";
-
- echo "</td>";
- echo "</tr>";
-
- if ($ID=="") {
-
- echo "<tr>";
- echo "<td class='tab_bg_2' valign='top' colspan='2' align='center'>";
- echo "<input type='submit' name='add' value=\"".$lang["buttons"][8]."\" class='submit'>";
- echo "</td>";
- echo "</form></tr>";
-
- echo "</table></div>";
-
- } else {
-
- echo "<tr>";
- echo "<td class='tab_bg_2' valign='top' align='center'>";
- echo "<input type='hidden' name='ID' value=\"$ID\">\n";
- echo "<input type='submit' name='update' value=\"".$lang["buttons"][7]."\" class='submit'>";
- echo "</td></form>\n\n";
- echo "<form action=\"$target\" method='post'>\n";
- echo "<td class='tab_bg_2' valign='top' align='center'>\n";
- echo "<input type='hidden' name='ID' value=\"$ID\">\n";
- echo "<div align='center'>";
- if ($printer->fields["deleted"]=='N')
- echo "<input type='submit' name='delete' value=\"".$lang["buttons"][6]."\" class='submit'>";
- else {
- echo "<input type='submit' name='restore' value=\"".$lang["buttons"][21]."\" class='submit'>";
-
- echo " <input type='submit' name='purge' value=\"".$lang["buttons"][22]."\" class='submit'>";
- }
- echo "</div>";
- echo "</td>";
- echo "</form></tr>";
-
- echo "</table></div>";
-
- showConnect($target,$ID,3);
-
- showPorts($ID,PRINTER_TYPE);
-
- showPortsAdd($ID,PRINTER_TYPE);
- }
-}
-
-
-function updatePrinter($input) {
- // Update a printer in the database
-
- $printer = new Printer;
- $printer->getFromDB($input["ID"]);
-
- // set new date and make sure it gets updated
- $updates[0]= "date_mod";
- $printer->fields["date_mod"] = date("Y-m-d H:i:s");
-
- // Pop off the last two attributes, no longer needed
- $null=array_pop($input);
- $null=array_pop($input);
-
- // Get all flags and fill with 0 if unchecked in form
- foreach ($printer->fields as $key => $val) {
- if (eregi("\.*flag\.*",$key)) {
- if (!isset($input[$key])) {
- $input[$key]=0;
- }
- }
- }
-
- // Fill the update-array with changes
- $x=1;
- foreach ($input as $key => $val) {
- if ($printer->fields[$key] != $input[$key]) {
- $printer->fields[$key] = $input[$key];
- $updates[$x] = $key;
- $x++;
- }
- }
-
- $printer->updateInDB($updates);
-
-}
-
-function addPrinter($input) {
- // Add Printer, nasty hack until we get PHP4-array-functions
-
- $printer = new Printer;
-
- // dump status
- $null = array_pop($input);
-
- // fill array for update
- foreach ($input as $key => $val) {
- if (empty($printer->fields[$key]) || $printer->fields[$key] != $input[$key]) {
- $printer->fields[$key] = $input[$key];
- }
- }
-
- $printer->addToDB();
-
-}
-
-function deletePrinter($input,$force=0) {
- // Delete Printer
-
- $printer = new Printer;
- $printer->deleteFromDB($input["ID"],$force);
-
-}
-
-function restorePrinter($input) {
- // Restore Printer
-
- $ct = new Printer;
- $ct->restoreInDB($input["ID"]);
-}
-
-?>
diff -Nur web/glpi/glpi/glpi/printers/_relpos.php glpi/glpi/printers/_relpos.php
--- web/glpi/glpi/glpi/printers/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/printers/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/_relpos.php glpi/glpi/_relpos.php
--- web/glpi/glpi/glpi/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/_relpos.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/reservation/classes.php glpi/glpi/reservation/classes.php
--- web/glpi/glpi/glpi/reservation/classes.php 2005-03-04 00:58:18.000000000 +0100
+++ glpi/glpi/reservation/classes.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
- GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
- This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/reservation/CVS/Entries glpi/glpi/reservation/CVS/Entries
--- web/glpi/glpi/glpi/reservation/CVS/Entries 2005-03-04 09:45:55.000000000 +0100
+++ glpi/glpi/reservation/CVS/Entries 2005-03-07 14:02:53.000000000 +0100
@@ -1,4 +1,4 @@
-/_relpos.php/1.2/Sat Feb 12 16:00:10 2005//
-/classes.php/1.15/Thu Mar 3 23:58:18 2005//
-/functions.php/1.26/Fri Mar 4 08:19:53 2005//
+/_relpos.php/1.3/Mon Mar 7 10:44:25 2005//
+/classes.php/1.16/Mon Mar 7 10:44:25 2005//
+/functions.php/1.27/Mon Mar 7 10:44:25 2005//
D
diff -Nur web/glpi/glpi/glpi/reservation/functions.php glpi/glpi/reservation/functions.php
--- web/glpi/glpi/glpi/reservation/functions.php 2005-03-04 09:19:53.000000000 +0100
+++ glpi/glpi/reservation/functions.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
- GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
- This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/reservation/_relpos.php glpi/glpi/reservation/_relpos.php
--- web/glpi/glpi/glpi/reservation/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/reservation/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/setup/classes.php glpi/glpi/setup/classes.php
--- web/glpi/glpi/glpi/setup/classes.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/setup/classes.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,26 +1,30 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
- LICENSE
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License (GPL)
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ LICENSE
- To read the license please visit http://www.gnu.org/copyleft/gpl.html
+ This file is part of GLPI.
+ GLPI is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ GLPI is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ 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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/setup/CVS/Entries glpi/glpi/setup/CVS/Entries
--- web/glpi/glpi/glpi/setup/CVS/Entries 2005-03-07 09:57:35.000000000 +0100
+++ glpi/glpi/setup/CVS/Entries 2005-03-07 14:02:53.000000000 +0100
@@ -1,4 +1,4 @@
-/_relpos.php/1.4/Sat Feb 12 16:00:10 2005//
-/classes.php/1.32/Sat Feb 12 16:00:10 2005//
-/functions.php/1.114/Mon Mar 7 08:57:35 2005//
+/_relpos.php/1.5/Mon Mar 7 10:44:25 2005//
+/classes.php/1.33/Mon Mar 7 10:44:25 2005//
+/functions.php/1.115/Mon Mar 7 10:44:25 2005//
D
diff -Nur web/glpi/glpi/glpi/setup/functions.php glpi/glpi/setup/functions.php
--- web/glpi/glpi/glpi/setup/functions.php 2005-03-07 09:57:35.000000000 +0100
+++ glpi/glpi/setup/functions.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,25 +1,30 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License (GPL)
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ This file is part of GLPI.
- To read the license please visit http://www.gnu.org/copyleft/gpl.html
+ GLPI is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ GLPI is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ 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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/setup/_relpos.php glpi/glpi/setup/_relpos.php
--- web/glpi/glpi/glpi/setup/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/setup/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/software/classes.php glpi/glpi/software/classes.php
--- web/glpi/glpi/glpi/software/classes.php 2005-03-07 09:57:35.000000000 +0100
+++ glpi/glpi/software/classes.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/software/CVS/Entries glpi/glpi/software/CVS/Entries
--- web/glpi/glpi/glpi/software/CVS/Entries 2005-03-07 09:57:35.000000000 +0100
+++ glpi/glpi/software/CVS/Entries 2005-03-07 14:02:54.000000000 +0100
@@ -1,4 +1,4 @@
-/_relpos.php/1.4/Sat Feb 12 16:00:10 2005//
-/classes.php/1.20/Mon Mar 7 08:57:35 2005//
-/functions.php/1.76/Mon Mar 7 08:57:35 2005//
+/_relpos.php/1.5/Mon Mar 7 10:44:25 2005//
+/classes.php/1.21/Mon Mar 7 10:44:25 2005//
+/functions.php/1.78/Mon Mar 7 11:02:39 2005//
D
diff -Nur web/glpi/glpi/glpi/software/functions.php glpi/glpi/software/functions.php
--- web/glpi/glpi/glpi/software/functions.php 2005-03-07 09:57:35.000000000 +0100
+++ glpi/glpi/software/functions.php 2005-03-07 12:02:39.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
@@ -44,7 +45,7 @@
echo "<div align='center'><table border='0'><tr><td>";
echo "<img src=\"".$HTMLRel."pics/logiciels.png\" alt='".$lang["software"][0]."' title='".$lang["software"][0]."'></td><td><a class='icon_consol' href=\"software-add-select.php\"><strong>".$lang["software"][0]."</strong></a>";
echo "</td>";
- echo "<td><a href='".$HTMLRel."setup/setup-templates.php?type=".SOFTWARE_TYPE."'>".$lang["common"][8]."</a></td>";
+ echo "<td><a class='icon_consol' href='".$HTMLRel."setup/setup-templates.php?type=".SOFTWARE_TYPE."'>".$lang["common"][9]."</a></td>";
echo "</tr></table></div>";
}
diff -Nur web/glpi/glpi/glpi/software/_relpos.php glpi/glpi/software/_relpos.php
--- web/glpi/glpi/glpi/software/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/software/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/glpi/tracking/classes.php glpi/glpi/tracking/classes.php
--- web/glpi/glpi/glpi/tracking/classes.php 2005-02-13 13:39:39.000000000 +0100
+++ glpi/glpi/tracking/classes.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/tracking/CVS/Entries glpi/glpi/tracking/CVS/Entries
--- web/glpi/glpi/glpi/tracking/CVS/Entries 2005-03-04 09:45:56.000000000 +0100
+++ glpi/glpi/tracking/CVS/Entries 2005-03-07 14:02:54.000000000 +0100
@@ -1,4 +1,4 @@
-/_relpos.php/1.4/Sat Feb 12 16:00:10 2005//
-/classes.php/1.26/Sun Feb 13 12:39:39 2005//
-/functions.php/1.106/Thu Mar 3 23:58:18 2005//
+/_relpos.php/1.5/Mon Mar 7 10:44:25 2005//
+/classes.php/1.27/Mon Mar 7 10:44:25 2005//
+/functions.php/1.107/Mon Mar 7 10:44:25 2005//
D
diff -Nur web/glpi/glpi/glpi/tracking/functions.php glpi/glpi/tracking/functions.php
--- web/glpi/glpi/glpi/tracking/functions.php 2005-03-04 00:58:18.000000000 +0100
+++ glpi/glpi/tracking/functions.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/glpi/tracking/_relpos.php glpi/glpi/tracking/_relpos.php
--- web/glpi/glpi/glpi/tracking/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/glpi/tracking/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/helpdesk/CVS/Entries glpi/helpdesk/CVS/Entries
--- web/glpi/glpi/helpdesk/CVS/Entries 2005-03-04 09:45:56.000000000 +0100
+++ glpi/helpdesk/CVS/Entries 2005-03-07 14:02:55.000000000 +0100
@@ -1,3 +1,3 @@
-/_relpos.php/1.2/Sat Feb 12 16:00:10 2005//
-/index.php/1.2/Sat Feb 12 16:00:10 2005//
+/_relpos.php/1.3/Mon Mar 7 10:44:25 2005//
+/index.php/1.3/Mon Mar 7 10:44:25 2005//
D
diff -Nur web/glpi/glpi/helpdesk/index.php glpi/helpdesk/index.php
--- web/glpi/glpi/helpdesk/index.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/helpdesk/index.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/helpdesk/_relpos.php glpi/helpdesk/_relpos.php
--- web/glpi/glpi/helpdesk/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/helpdesk/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/helpdesk.php glpi/helpdesk.php
--- web/glpi/glpi/helpdesk.php 2005-03-02 00:05:59.000000000 +0100
+++ glpi/helpdesk.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/index.php glpi/index.php
--- web/glpi/glpi/index.php 2005-03-01 00:44:29.000000000 +0100
+++ glpi/index.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
----------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
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
-
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/infocoms/CVS/Entries glpi/infocoms/CVS/Entries
--- web/glpi/glpi/infocoms/CVS/Entries 2005-03-04 09:45:56.000000000 +0100
+++ glpi/infocoms/CVS/Entries 2005-03-07 14:02:55.000000000 +0100
@@ -1,4 +1,4 @@
-/_relpos.php/1.1/Sat Feb 19 16:25:46 2005//
-/index.php/1.2/Sat Feb 26 20:25:46 2005//
-/infocoms-info-form.php/1.5/Wed Mar 2 16:33:09 2005//
+/_relpos.php/1.2/Mon Mar 7 10:44:25 2005//
+/index.php/1.3/Mon Mar 7 10:44:25 2005//
+/infocoms-info-form.php/1.6/Mon Mar 7 10:44:25 2005//
D
diff -Nur web/glpi/glpi/infocoms/index.php glpi/infocoms/index.php
--- web/glpi/glpi/infocoms/index.php 2005-02-26 21:25:46.000000000 +0100
+++ glpi/infocoms/index.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/infocoms/infocoms-info-form.php glpi/infocoms/infocoms-info-form.php
--- web/glpi/glpi/infocoms/infocoms-info-form.php 2005-03-02 17:33:09.000000000 +0100
+++ glpi/infocoms/infocoms-info-form.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/infocoms/_relpos.php glpi/infocoms/_relpos.php
--- web/glpi/glpi/infocoms/_relpos.php 2005-02-19 17:25:46.000000000 +0100
+++ glpi/infocoms/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/install.php glpi/install.php
--- web/glpi/glpi/install.php 2005-02-14 23:56:22.000000000 +0100
+++ glpi/install.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/knowbase/CVS/Entries glpi/knowbase/CVS/Entries
--- web/glpi/glpi/knowbase/CVS/Entries 2005-03-04 09:45:56.000000000 +0100
+++ glpi/knowbase/CVS/Entries 2005-03-07 14:02:55.000000000 +0100
@@ -1,4 +1,4 @@
-/_relpos.php/1.2/Sat Feb 12 16:00:10 2005//
-/index.php/1.7/Sat Feb 12 19:10:21 2005//
-/knowbase-info-form.php/1.5/Sat Feb 12 19:10:21 2005//
+/_relpos.php/1.3/Mon Mar 7 10:44:25 2005//
+/index.php/1.8/Mon Mar 7 10:44:25 2005//
+/knowbase-info-form.php/1.6/Mon Mar 7 10:44:25 2005//
D
diff -Nur web/glpi/glpi/knowbase/index.php glpi/knowbase/index.php
--- web/glpi/glpi/knowbase/index.php 2005-02-12 20:10:21.000000000 +0100
+++ glpi/knowbase/index.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/knowbase/knowbase-info-form.php glpi/knowbase/knowbase-info-form.php
--- web/glpi/glpi/knowbase/knowbase-info-form.php 2005-02-12 20:10:21.000000000 +0100
+++ glpi/knowbase/knowbase-info-form.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
- GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
- This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/knowbase/_relpos.php glpi/knowbase/_relpos.php
--- web/glpi/glpi/knowbase/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/knowbase/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/ldap/CVS/Entries glpi/ldap/CVS/Entries
--- web/glpi/glpi/ldap/CVS/Entries 1970-01-01 01:00:00.000000000 +0100
+++ glpi/ldap/CVS/Entries 2005-03-07 14:02:55.000000000 +0100
@@ -0,0 +1 @@
+D
diff -Nur web/glpi/glpi/ldap/CVS/Repository glpi/ldap/CVS/Repository
--- web/glpi/glpi/ldap/CVS/Repository 1970-01-01 01:00:00.000000000 +0100
+++ glpi/ldap/CVS/Repository 2005-03-07 14:02:55.000000000 +0100
@@ -0,0 +1 @@
+glpi/ldap
diff -Nur web/glpi/glpi/ldap/CVS/Root glpi/ldap/CVS/Root
--- web/glpi/glpi/ldap/CVS/Root 1970-01-01 01:00:00.000000000 +0100
+++ glpi/ldap/CVS/Root 2005-03-07 14:02:55.000000000 +0100
@@ -0,0 +1 @@
+:pserver:[EMAIL PROTECTED]
diff -Nur web/glpi/glpi/LISEZMOI.txt glpi/LISEZMOI.txt
--- web/glpi/glpi/LISEZMOI.txt 2005-02-13 00:04:32.000000000 +0100
+++ glpi/LISEZMOI.txt 2005-03-07 11:44:24.000000000 +0100
@@ -1,27 +1,29 @@
/*
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
- This program is free software; you can redistribute it and/or modify
+ This file is part of GLPI.
+
+ GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ GLPI is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
+ along with GLPI; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- ----------------------------------------------------------------------
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/login.php glpi/login.php
--- web/glpi/glpi/login.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/login.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/logout.php glpi/logout.php
--- web/glpi/glpi/logout.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/logout.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/modify_headers.pl glpi/modify_headers.pl
--- web/glpi/glpi/modify_headers.pl 2005-02-12 17:00:10.000000000 +0100
+++ glpi/modify_headers.pl 2005-03-07 11:44:24.000000000 +0100
@@ -2,28 +2,31 @@
#!/usr/bin/perl -w
-# ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
# GLPI - Gestionnaire Libre de Parc Informatique
-# Copyright (C) 2004 by the INDEPNET Development Team.
+# Copyright (C) 2003-2005 by the INDEPNET Development Team.
#
# http://indepnet.net/ http://glpi.indepnet.org
# ----------------------------------------------------------------------
+#
# LICENSE
-# This program is free software; you can redistribute it and/or modify
+#
+# This file is part of GLPI.
+#
+# GLPI is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful,
+# GLPI is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with GLPI; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# ----------------------------------------------------------------------
+# ------------------------------------------------------------------------
diff -Nur web/glpi/glpi/monitors/CVS/Entries glpi/monitors/CVS/Entries
--- web/glpi/glpi/monitors/CVS/Entries 2005-03-07 09:57:35.000000000 +0100
+++ glpi/monitors/CVS/Entries 2005-03-07 14:02:55.000000000 +0100
@@ -1,6 +1,6 @@
-/_relpos.php/1.4/Sat Feb 12 16:00:10 2005//
-/index.php/1.14/Thu Mar 3 21:55:50 2005//
-/monitors-search.php/1.16/Thu Mar 3 21:55:50 2005//
-/monitors-add-select.php/1.1/Sun Mar 6 22:05:29 2005//
-/monitors-info-form.php/1.25/Mon Mar 7 08:57:35 2005//
+/_relpos.php/1.5/Mon Mar 7 10:44:25 2005//
+/index.php/1.15/Mon Mar 7 10:44:25 2005//
+/monitors-add-select.php/1.2/Mon Mar 7 10:44:25 2005//
+/monitors-info-form.php/1.26/Mon Mar 7 10:44:25 2005//
+/monitors-search.php/1.17/Mon Mar 7 10:44:25 2005//
D
diff -Nur web/glpi/glpi/monitors/index.php glpi/monitors/index.php
--- web/glpi/glpi/monitors/index.php 2005-03-03 22:55:50.000000000 +0100
+++ glpi/monitors/index.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/monitors/monitors-add-select.php glpi/monitors/monitors-add-select.php
--- web/glpi/glpi/monitors/monitors-add-select.php 2005-03-06 23:05:29.000000000 +0100
+++ glpi/monitors/monitors-add-select.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/monitors/monitors-info-form.php glpi/monitors/monitors-info-form.php
--- web/glpi/glpi/monitors/monitors-info-form.php 2005-03-07 09:57:35.000000000 +0100
+++ glpi/monitors/monitors-info-form.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/monitors/monitors-search.php glpi/monitors/monitors-search.php
--- web/glpi/glpi/monitors/monitors-search.php 2005-03-03 22:55:50.000000000 +0100
+++ glpi/monitors/monitors-search.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/monitors/_relpos.php glpi/monitors/_relpos.php
--- web/glpi/glpi/monitors/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/monitors/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/mycalendar.php glpi/mycalendar.php
--- web/glpi/glpi/mycalendar.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/mycalendar.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
- GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
- This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/mysql/CVS/Entries glpi/mysql/CVS/Entries
--- web/glpi/glpi/mysql/CVS/Entries 2005-03-07 09:57:35.000000000 +0100
+++ glpi/mysql/CVS/Entries 2005-03-07 14:03:05.000000000 +0100
@@ -1,7 +1,7 @@
/glpi-0.3-default.sql/1.9/Thu Sep 23 18:16:15 2004//
/glpi-0.4-default.sql/1.15/Thu Sep 23 18:46:23 2004//
/glpi-0.42-default.sql/1.5/Wed Nov 17 18:38:16 2004//
+/glpi-0.5-default.sql/1.22/Sun Mar 6 17:54:37 2005//
/glpi-bigdump-0.4.sql/1.14/Wed Sep 22 21:51:43 2004//
/updatedb.back/1.3/Sat Feb 12 16:00:10 2005//
-/glpi-0.5-default.sql/1.22/Mon Mar 7 08:57:35 2005//
D
diff -Nur web/glpi/glpi/networking/CVS/Entries glpi/networking/CVS/Entries
--- web/glpi/glpi/networking/CVS/Entries 2005-03-07 09:57:35.000000000 +0100
+++ glpi/networking/CVS/Entries 2005-03-07 14:03:05.000000000 +0100
@@ -1,9 +1,9 @@
-/_relpos.php/1.4/Sat Feb 12 16:00:10 2005//
-/index.php/1.15/Thu Mar 3 22:37:41 2005//
-/networking-port-connect.php/1.12/Sat Feb 12 18:57:28 2005//
-/networking-port-disconnect.php/1.8/Sun Feb 13 19:07:22 2005//
-/networking-port.php/1.24/Sat Feb 12 18:57:28 2005//
-/networking-search.php/1.9/Thu Mar 3 22:37:41 2005//
-/networking-add-select.php/1.1/Sun Mar 6 21:24:51 2005//
-/networking-info-form.php/1.25/Mon Mar 7 08:57:35 2005//
+/_relpos.php/1.5/Mon Mar 7 10:44:25 2005//
+/index.php/1.16/Mon Mar 7 10:44:25 2005//
+/networking-add-select.php/1.2/Mon Mar 7 10:44:25 2005//
+/networking-info-form.php/1.26/Mon Mar 7 10:44:25 2005//
+/networking-port-connect.php/1.13/Mon Mar 7 10:44:25 2005//
+/networking-port-disconnect.php/1.9/Mon Mar 7 10:44:25 2005//
+/networking-port.php/1.25/Mon Mar 7 10:44:25 2005//
+/networking-search.php/1.10/Mon Mar 7 10:44:25 2005//
D
diff -Nur web/glpi/glpi/networking/index.php glpi/networking/index.php
--- web/glpi/glpi/networking/index.php 2005-03-03 23:37:41.000000000 +0100
+++ glpi/networking/index.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/networking/networking-add-select.php glpi/networking/networking-add-select.php
--- web/glpi/glpi/networking/networking-add-select.php 2005-03-06 22:24:51.000000000 +0100
+++ glpi/networking/networking-add-select.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/networking/networking-info-form.php glpi/networking/networking-info-form.php
--- web/glpi/glpi/networking/networking-info-form.php 2005-03-07 09:57:35.000000000 +0100
+++ glpi/networking/networking-info-form.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/networking/networking-port-connect.php glpi/networking/networking-port-connect.php
--- web/glpi/glpi/networking/networking-port-connect.php 2005-02-12 19:57:28.000000000 +0100
+++ glpi/networking/networking-port-connect.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/networking/networking-port-disconnect.php glpi/networking/networking-port-disconnect.php
--- web/glpi/glpi/networking/networking-port-disconnect.php 2005-02-13 20:07:22.000000000 +0100
+++ glpi/networking/networking-port-disconnect.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/networking/networking-port.php glpi/networking/networking-port.php
--- web/glpi/glpi/networking/networking-port.php 2005-02-12 19:57:28.000000000 +0100
+++ glpi/networking/networking-port.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/networking/networking-search.php glpi/networking/networking-search.php
--- web/glpi/glpi/networking/networking-search.php 2005-03-03 23:37:41.000000000 +0100
+++ glpi/networking/networking-search.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/networking/_relpos.php glpi/networking/_relpos.php
--- web/glpi/glpi/networking/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/networking/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/peripherals/CVS/Entries glpi/peripherals/CVS/Entries
--- web/glpi/glpi/peripherals/CVS/Entries 2005-03-07 09:57:35.000000000 +0100
+++ glpi/peripherals/CVS/Entries 2005-03-07 14:03:05.000000000 +0100
@@ -1,6 +1,6 @@
-/_relpos.php/1.3/Sat Feb 12 16:00:10 2005//
-/index.php/1.7/Thu Mar 3 21:43:17 2005//
-/peripherals-search.php/1.9/Thu Mar 3 21:43:17 2005//
-/peripherals-add-select.php/1.1/Sun Mar 6 22:30:09 2005//
-/peripherals-info-form.php/1.19/Mon Mar 7 08:57:35 2005//
+/_relpos.php/1.4/Mon Mar 7 10:44:25 2005//
+/index.php/1.8/Mon Mar 7 10:44:25 2005//
+/peripherals-add-select.php/1.2/Mon Mar 7 10:44:25 2005//
+/peripherals-info-form.php/1.20/Mon Mar 7 10:44:25 2005//
+/peripherals-search.php/1.10/Mon Mar 7 10:44:25 2005//
D
diff -Nur web/glpi/glpi/peripherals/index.php glpi/peripherals/index.php
--- web/glpi/glpi/peripherals/index.php 2005-03-03 22:43:17.000000000 +0100
+++ glpi/peripherals/index.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/peripherals/peripherals-add-select.php glpi/peripherals/peripherals-add-select.php
--- web/glpi/glpi/peripherals/peripherals-add-select.php 2005-03-06 23:30:09.000000000 +0100
+++ glpi/peripherals/peripherals-add-select.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/peripherals/peripherals-info-form.php glpi/peripherals/peripherals-info-form.php
--- web/glpi/glpi/peripherals/peripherals-info-form.php 2005-03-07 09:57:35.000000000 +0100
+++ glpi/peripherals/peripherals-info-form.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/peripherals/peripherals-search.php glpi/peripherals/peripherals-search.php
--- web/glpi/glpi/peripherals/peripherals-search.php 2005-03-03 22:43:17.000000000 +0100
+++ glpi/peripherals/peripherals-search.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/peripherals/_relpos.php glpi/peripherals/_relpos.php
--- web/glpi/glpi/peripherals/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/peripherals/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/pics/CVS/Entries glpi/pics/CVS/Entries
--- web/glpi/glpi/pics/CVS/Entries 2005-03-07 09:57:36.000000000 +0100
+++ glpi/pics/CVS/Entries 2005-03-07 14:03:06.000000000 +0100
@@ -4,9 +4,13 @@
/ajoutinterv.png/1.1/Sat May 22 23:09:32 2004/-kb/
/arrow-left.png/1.1/Mon Aug 30 18:36:33 2004/-kb/
/authentification.png/1.5/Tue Jul 27 10:39:00 2004/-kb/
+/barre.png/1.1/Sun Mar 6 17:19:47 2005/-kb/
+/bleu.png/1.1/Sun Mar 6 17:19:47 2005/-kb/
/calendar.png/1.1/Tue Mar 1 21:42:26 2005/-kb/
/cartouches.png/1.1/Mon Feb 14 12:59:11 2005/-kb/
+/centre.png/1.1/Sun Mar 6 17:19:47 2005/-kb/
/clear.png/1.4/Fri Nov 12 18:33:13 2004/-kb/
+/code.png/1.1/Sun Mar 6 17:19:47 2005/-kb/
/computer.png/1.1/Mon Jul 12 11:59:13 2004/-kb/
/config.png/1.1/Tue Jan 27 21:03:18 2004/-kb/
/configuration.png/1.1/Mon Jul 12 11:59:13 2004/-kb/
@@ -24,8 +28,12 @@
/favicon.ico/1.1/Sat Feb 26 23:48:32 2005/-kb/
/fond-stats.gif/1.2/Sat Feb 5 22:48:48 2005/-kb/
/gestion.png/1.1/Tue Mar 1 21:42:26 2005/-kb/
+/grand.png/1.1/Sun Mar 6 17:19:47 2005/-kb/
+/gras.png/1.1/Sun Mar 6 17:19:47 2005/-kb/
/help.png/1.1/Sun Sep 12 21:36:10 2004/-kb/
/inventaire.png/1.2/Sat May 22 23:09:31 2004/-kb/
+/italique.png/1.1/Sun Mar 6 17:19:47 2005/-kb/
+/jaune.png/1.1/Sun Mar 6 17:19:47 2005/-kb/
/key.png/1.1/Thu Jul 8 14:47:08 2004/-kb/
/knowbase.png/1.1/Tue Dec 28 15:14:24 2004/-kb/
/ldap.png/1.1/Tue Jan 27 21:03:18 2004/-kb/
@@ -51,22 +59,14 @@
/reset.png/1.1/Wed Mar 2 18:39:25 2005/-kb/
/rien.gif/1.1/Sat Feb 5 19:51:43 2005/-kb/
/right.png/1.1/Fri Nov 12 18:33:13 2004/-kb/
+/rouge.png/1.1/Sun Mar 6 17:19:47 2005/-kb/
/sauvegardes.png/1.1/Mon Jul 12 11:59:13 2004/-kb/
/showdeleted.png/1.1/Thu Feb 24 22:00:21 2005/-kb/
+/souligne.png/1.1/Sun Mar 6 17:19:47 2005/-kb/
/statistiques.png/1.1/Mon Jul 12 11:59:13 2004/-kb/
/suivi-intervention.png/1.1/Mon Jul 12 11:59:13 2004/-kb/
/suivi.png/1.1/Sat May 22 23:09:32 2004/-kb/
/users.png/1.4/Wed Jul 21 12:40:27 2004/-kb/
/warning.png/1.2/Thu Feb 19 22:06:15 2004/-kb/
/web.png/1.1/Tue Mar 1 22:18:46 2005/-kb/
-/barre.png/1.1/Sun Mar 6 17:19:47 2005/-kb/
-/bleu.png/1.1/Sun Mar 6 17:19:47 2005/-kb/
-/centre.png/1.1/Sun Mar 6 17:19:47 2005/-kb/
-/code.png/1.1/Sun Mar 6 17:19:47 2005/-kb/
-/grand.png/1.1/Sun Mar 6 17:19:47 2005/-kb/
-/gras.png/1.1/Sun Mar 6 17:19:47 2005/-kb/
-/italique.png/1.1/Sun Mar 6 17:19:47 2005/-kb/
-/jaune.png/1.1/Sun Mar 6 17:19:47 2005/-kb/
-/rouge.png/1.1/Sun Mar 6 17:19:47 2005/-kb/
-/souligne.png/1.1/Sun Mar 6 17:19:47 2005/-kb/
D
diff -Nur web/glpi/glpi/preferences/CVS/Entries glpi/preferences/CVS/Entries
--- web/glpi/glpi/preferences/CVS/Entries 2005-03-04 09:46:05.000000000 +0100
+++ glpi/preferences/CVS/Entries 2005-03-07 14:03:06.000000000 +0100
@@ -1,3 +1,3 @@
-/_relpos.php/1.4/Sat Feb 12 16:00:10 2005//
-/index.php/1.18/Sun Feb 13 19:07:22 2005//
+/_relpos.php/1.5/Mon Mar 7 10:44:25 2005//
+/index.php/1.19/Mon Mar 7 10:44:25 2005//
D
diff -Nur web/glpi/glpi/preferences/index.php glpi/preferences/index.php
--- web/glpi/glpi/preferences/index.php 2005-02-13 20:07:22.000000000 +0100
+++ glpi/preferences/index.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/preferences/_relpos.php glpi/preferences/_relpos.php
--- web/glpi/glpi/preferences/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/preferences/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/printers/CVS/Entries glpi/printers/CVS/Entries
--- web/glpi/glpi/printers/CVS/Entries 2005-03-07 09:57:36.000000000 +0100
+++ glpi/printers/CVS/Entries 2005-03-07 14:03:06.000000000 +0100
@@ -1,6 +1,6 @@
-/_relpos.php/1.4/Sat Feb 12 16:00:10 2005//
-/index.php/1.15/Thu Mar 3 22:20:36 2005//
-/printers-search.php/1.19/Thu Mar 3 22:20:37 2005//
-/printers-add-select.php/1.2/Sun Mar 6 20:03:10 2005//
-/printers-info-form.php/1.27/Mon Mar 7 08:57:36 2005//
+/_relpos.php/1.5/Mon Mar 7 10:44:25 2005//
+/index.php/1.16/Mon Mar 7 10:44:25 2005//
+/printers-add-select.php/1.3/Mon Mar 7 10:44:25 2005//
+/printers-info-form.php/1.28/Mon Mar 7 10:44:25 2005//
+/printers-search.php/1.20/Mon Mar 7 10:44:25 2005//
D
diff -Nur web/glpi/glpi/printers/index.php glpi/printers/index.php
--- web/glpi/glpi/printers/index.php 2005-03-03 23:20:36.000000000 +0100
+++ glpi/printers/index.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/printers/printers-add-select.php glpi/printers/printers-add-select.php
--- web/glpi/glpi/printers/printers-add-select.php 2005-03-06 21:03:10.000000000 +0100
+++ glpi/printers/printers-add-select.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/printers/printers-info-form.php glpi/printers/printers-info-form.php
--- web/glpi/glpi/printers/printers-info-form.php 2005-03-07 09:57:36.000000000 +0100
+++ glpi/printers/printers-info-form.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/printers/printers-search.php glpi/printers/printers-search.php
--- web/glpi/glpi/printers/printers-search.php 2005-03-03 23:20:37.000000000 +0100
+++ glpi/printers/printers-search.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/printers/_relpos.php glpi/printers/_relpos.php
--- web/glpi/glpi/printers/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/printers/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/README.txt glpi/README.txt
--- web/glpi/glpi/README.txt 2005-02-13 00:04:32.000000000 +0100
+++ glpi/README.txt 2005-03-07 11:44:24.000000000 +0100
@@ -1,26 +1,29 @@
/*
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
- This program is free software; you can redistribute it and/or modify
+
+ This file is part of GLPI.
+
+ GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ GLPI is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
+ along with GLPI; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- ----------------------------------------------------------------------
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/_relpos.php glpi/_relpos.php
--- web/glpi/glpi/_relpos.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/_relpos.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/reports/CVS/Entries glpi/reports/CVS/Entries
--- web/glpi/glpi/reports/CVS/Entries 2005-03-04 09:50:47.000000000 +0100
+++ glpi/reports/CVS/Entries 2005-03-07 14:03:06.000000000 +0100
@@ -1,3 +1,3 @@
-/_relpos.php/1.4/Sat Feb 12 16:00:11 2005//
-/index.php/1.17/Sat Feb 12 19:10:21 2005//
-D/reports////
+/_relpos.php/1.5/Mon Mar 7 10:44:25 2005//
+/index.php/1.18/Mon Mar 7 10:44:25 2005//
+D
diff -Nur web/glpi/glpi/reports/CVS/Entries.Log glpi/reports/CVS/Entries.Log
--- web/glpi/glpi/reports/CVS/Entries.Log 1970-01-01 01:00:00.000000000 +0100
+++ glpi/reports/CVS/Entries.Log 2005-03-07 14:03:06.000000000 +0100
@@ -0,0 +1 @@
+A D/reports////
diff -Nur web/glpi/glpi/reports/index.php glpi/reports/index.php
--- web/glpi/glpi/reports/index.php 2005-03-04 11:22:34.000000000 +0100
+++ glpi/reports/index.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
@@ -71,8 +72,6 @@
$report_list["Intervention"]["file"] = "reports/tracking.php";
$report_list["excel"]["name"] = "Excel, OpenOffice, gnumeric, mulitplan (Sylk)";
$report_list["excel"]["file"] = "reports/geneSylk.php";
-$report_list["Rapport prises reseau"]["name"]=$lang["reports"][33];
-$report_list["Rapport prises reseau"]["file"]="reports/reseau.php";
$i = 0;
diff -Nur web/glpi/glpi/reports/Pindex.diff glpi/reports/Pindex.diff
--- web/glpi/glpi/reports/Pindex.diff 2005-03-04 10:54:50.000000000 +0100
+++ glpi/reports/Pindex.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- index.php 2005-02-12 20:10:21.000000000 +0100
-+++ indexB.php 2005-03-04 09:53:51.000000000 +0100
-@@ -71,6 +71,8 @@
- $report_list["Intervention"]["file"] = "reports/tracking.php";
- $report_list["excel"]["name"] = "Excel, OpenOffice, gnumeric, mulitplan (Sylk)";
- $report_list["excel"]["file"] = "reports/geneSylk.php";
-+$report_list["Rapport prises reseau"]["name"]=$lang["reports"][33];
-+$report_list["Rapport prises reseau"]["file"]="reports/reseau.php";
-
-
- $i = 0;
diff -Nur web/glpi/glpi/reports/_relpos.php glpi/reports/_relpos.php
--- web/glpi/glpi/reports/_relpos.php 2005-02-12 17:00:11.000000000 +0100
+++ glpi/reports/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/reports/reports/convexcel/CVS/Entries glpi/reports/reports/convexcel/CVS/Entries
--- web/glpi/glpi/reports/reports/convexcel/CVS/Entries 1970-01-01 01:00:00.000000000 +0100
+++ glpi/reports/reports/convexcel/CVS/Entries 2005-03-07 14:03:06.000000000 +0100
@@ -0,0 +1 @@
+D
diff -Nur web/glpi/glpi/reports/reports/convexcel/CVS/Entries.Log glpi/reports/reports/convexcel/CVS/Entries.Log
--- web/glpi/glpi/reports/reports/convexcel/CVS/Entries.Log 1970-01-01 01:00:00.000000000 +0100
+++ glpi/reports/reports/convexcel/CVS/Entries.Log 2005-03-07 14:03:06.000000000 +0100
@@ -0,0 +1 @@
+A D/tmp////
diff -Nur web/glpi/glpi/reports/reports/convexcel/CVS/Repository glpi/reports/reports/convexcel/CVS/Repository
--- web/glpi/glpi/reports/reports/convexcel/CVS/Repository 1970-01-01 01:00:00.000000000 +0100
+++ glpi/reports/reports/convexcel/CVS/Repository 2005-03-07 14:03:06.000000000 +0100
@@ -0,0 +1 @@
+glpi/reports/reports/convexcel
diff -Nur web/glpi/glpi/reports/reports/convexcel/CVS/Root glpi/reports/reports/convexcel/CVS/Root
--- web/glpi/glpi/reports/reports/convexcel/CVS/Root 1970-01-01 01:00:00.000000000 +0100
+++ glpi/reports/reports/convexcel/CVS/Root 2005-03-07 14:03:06.000000000 +0100
@@ -0,0 +1 @@
+:pserver:[EMAIL PROTECTED]
diff -Nur web/glpi/glpi/reports/reports/convexcel/tmp/CVS/Entries glpi/reports/reports/convexcel/tmp/CVS/Entries
--- web/glpi/glpi/reports/reports/convexcel/tmp/CVS/Entries 1970-01-01 01:00:00.000000000 +0100
+++ glpi/reports/reports/convexcel/tmp/CVS/Entries 2005-03-07 14:03:06.000000000 +0100
@@ -0,0 +1 @@
+D
diff -Nur web/glpi/glpi/reports/reports/convexcel/tmp/CVS/Repository glpi/reports/reports/convexcel/tmp/CVS/Repository
--- web/glpi/glpi/reports/reports/convexcel/tmp/CVS/Repository 1970-01-01 01:00:00.000000000 +0100
+++ glpi/reports/reports/convexcel/tmp/CVS/Repository 2005-03-07 14:03:06.000000000 +0100
@@ -0,0 +1 @@
+glpi/reports/reports/convexcel/tmp
diff -Nur web/glpi/glpi/reports/reports/convexcel/tmp/CVS/Root glpi/reports/reports/convexcel/tmp/CVS/Root
--- web/glpi/glpi/reports/reports/convexcel/tmp/CVS/Root 1970-01-01 01:00:00.000000000 +0100
+++ glpi/reports/reports/convexcel/tmp/CVS/Root 2005-03-07 14:03:06.000000000 +0100
@@ -0,0 +1 @@
+:pserver:[EMAIL PROTECTED]
diff -Nur web/glpi/glpi/reports/reports/CVS/Entries glpi/reports/reports/CVS/Entries
--- web/glpi/glpi/reports/reports/CVS/Entries 2005-03-07 09:57:36.000000000 +0100
+++ glpi/reports/reports/CVS/Entries 2005-03-07 14:03:06.000000000 +0100
@@ -1,10 +1,10 @@
-/_relpos.php/1.4/Sat Feb 12 16:00:11 2005//
-/geneSylk.php/1.10/Sat Feb 12 22:17:22 2005//
-/maintenance-list.php/1.13/Sat Feb 12 19:10:21 2005//
-/maintenance.php/1.19/Sat Feb 12 19:10:21 2005//
-/parAnnee-list.php/1.14/Sat Feb 12 19:10:21 2005//
-/parAnnee.php/1.19/Sat Feb 12 19:10:21 2005//
-/rapport-sylk.php/1.12/Sat Feb 12 22:17:22 2005//
-/tracking.php/1.9/Sat Feb 12 20:46:59 2005//
-/default.php/1.15/Mon Mar 7 08:57:36 2005//
+/_relpos.php/1.5/Mon Mar 7 10:44:25 2005//
+/default.php/1.16/Mon Mar 7 10:44:25 2005//
+/geneSylk.php/1.11/Mon Mar 7 10:44:25 2005//
+/maintenance-list.php/1.14/Mon Mar 7 10:44:25 2005//
+/maintenance.php/1.20/Mon Mar 7 10:44:25 2005//
+/parAnnee-list.php/1.15/Mon Mar 7 10:44:25 2005//
+/parAnnee.php/1.20/Mon Mar 7 10:44:25 2005//
+/rapport-sylk.php/1.13/Mon Mar 7 10:44:25 2005//
+/tracking.php/1.10/Mon Mar 7 10:44:25 2005//
D
diff -Nur web/glpi/glpi/reports/reports/CVS/Entries.Log glpi/reports/reports/CVS/Entries.Log
--- web/glpi/glpi/reports/reports/CVS/Entries.Log 1970-01-01 01:00:00.000000000 +0100
+++ glpi/reports/reports/CVS/Entries.Log 2005-03-07 14:03:06.000000000 +0100
@@ -0,0 +1,2 @@
+A D/convexcel////
+A D/phpexcel////
diff -Nur web/glpi/glpi/reports/reports/default.php glpi/reports/reports/default.php
--- web/glpi/glpi/reports/reports/default.php 2005-03-07 09:57:36.000000000 +0100
+++ glpi/reports/reports/default.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
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
- ----------------------------------------------------------------------
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/reports/reports/geneSylk.php glpi/reports/reports/geneSylk.php
--- web/glpi/glpi/reports/reports/geneSylk.php 2005-02-12 23:17:22.000000000 +0100
+++ glpi/reports/reports/geneSylk.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/reports/reports/maintenance-list.php glpi/reports/reports/maintenance-list.php
--- web/glpi/glpi/reports/reports/maintenance-list.php 2005-02-12 20:10:21.000000000 +0100
+++ glpi/reports/reports/maintenance-list.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
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
- ----------------------------------------------------------------------
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/reports/reports/maintenance.php glpi/reports/reports/maintenance.php
--- web/glpi/glpi/reports/reports/maintenance.php 2005-02-12 20:10:21.000000000 +0100
+++ glpi/reports/reports/maintenance.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/reports/reports/parAnnee-list.php glpi/reports/reports/parAnnee-list.php
--- web/glpi/glpi/reports/reports/parAnnee-list.php 2005-03-04 13:43:44.000000000 +0100
+++ glpi/reports/reports/parAnnee-list.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
@@ -70,7 +71,6 @@
$query.= " order by ".$_POST["tri_par"]." asc";
report_perso($val,$query);
}
- echo $query;
}
else
{
@@ -90,8 +90,7 @@
$query[$i].=" order by ".$_POST["tri_par"]." asc";
report_perso($item_db_name[$i],$query[$i]);
- }
- print_r($query);
+ }
}
commonFooter();
?>
diff -Nur web/glpi/glpi/reports/reports/parAnnee-list.php~ glpi/reports/reports/parAnnee-list.php~
--- web/glpi/glpi/reports/reports/parAnnee-list.php~ 2005-03-04 13:42:48.000000000 +0100
+++ glpi/reports/reports/parAnnee-list.php~ 1970-01-01 01:00:00.000000000 +0100
@@ -1,97 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
-*/
-
-// ----------------------------------------------------------------------
-// Original Author of file:
-// Purpose of file:
-// ----------------------------------------------------------------------
-
-include ("_relpos.php");
-include ($phproot . "/glpi/includes.php");
-
-checkAuthentication("normal");
-commonHeader($lang["title"][16],$_SERVER["PHP_SELF"]);
-
-
-$item_db_name[0] = "glpi_computers";
-$item_db_name[1] = "glpi_printers";
-$item_db_name[2] = "glpi_monitors";
-$item_db_name[3] = "glpi_networking";
-$item_db_name[4] = "glpi_peripherals";
-
-$db = new DB;
-
-
-# Titre
-
-echo "";
-echo "<big><b><strong>Liste du materiel</strong></b></big><br><br>";
-
-# Construction la requete, et appel de la fonction affichant les valeurs.
-if(isset($_POST["item_type"][0])&&$_POST["item_type"][0] != 'tous')
-{
-
- foreach($_POST["item_type"] as $key => $val){
- $query = "select * from ".$val;
-
- if(isset($_POST["annee"][0])&&$_POST["annee"][0] != 'toutes')
- {
- $query.= " where ( '1'='0' ";
- foreach ($_POST["annee"] as $key2 => $val2)
- $query.= " OR YEAR(".$_POST["date_type"].") = '".$val2."'";
- $query.=" ) ";
- }
-
- $query.= " order by ".$_POST["tri_par"]." asc";
- report_perso($val,$query);
- }
- echo $query;
-}
-else
-{
- $query=array();
- for($i=0;$i<count($item_db_name);$i++)
- {
- $query[$i] = "select * from ".$item_db_name[$i]." ";
-
-
- if(isset($_POST["annee"][0])&&$_POST["annee"][0] != 'toutes')
- {
- $query[$i].= " where ( '1'='0' ";
- foreach ($_POST["annee"] as $key2 => $val2)
- $query[$i].= " OR YEAR(".$_POST["date_type"].") = '".$val2."'";
- $query[$i].=" ) ";
- }
-
- $query[$i].=" order by ".$_POST["tri_par"]." asc";
- report_perso($item_db_name[$i],$query[$i]);
- }
- echo $query;
-}
-commonFooter();
-?>
diff -Nur web/glpi/glpi/reports/reports/parAnnee.php glpi/reports/reports/parAnnee.php
--- web/glpi/glpi/reports/reports/parAnnee.php 2005-02-12 20:10:21.000000000 +0100
+++ glpi/reports/reports/parAnnee.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/reports/reports/parBureau-list.php glpi/reports/reports/parBureau-list.php
--- web/glpi/glpi/reports/reports/parBureau-list.php 2005-03-07 11:50:59.000000000 +0100
+++ glpi/reports/reports/parBureau-list.php 1970-01-01 01:00:00.000000000 +0100
@@ -1,111 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
- ----------------------------------------------------------------------
- Original Author of file:
- <?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
- ----------------------------------------------------------------------
- Original Author of file:
- Purpose of file:
- ----------------------------------------------------------------------
-*/
-/*!
- \brief affiche le rapport réseau par bureau
-
-*/
-
-
-
-include ("_relpos.php");
-include($phproot . "/glpi/networking/_relpos.php");
-include ($phproot . "/glpi/includes.php");
-include ($phproot . "/glpi/includes_networking.php");
-checkAuthentication("normal");
-commonHeader("Reports",$_SERVER["PHP_SELF"]);
-
-
-$item_db_name[0]="glpi_dropdow_location";
-
-
-$db = new DB;
-$query2="SELECT a.name as office,b.name as stage
-FROM glpi_dropdown_locations a
-LEFT JOIN glpi_dropdown_locations b ON b.id=a.parentid
-WHERE a.id=".$_POST["location"]."";
-$result = $db->query($query2);
-$ligne = $db->fetch_array($result);
-$stage=$ligne['stage'];
-$office=$ligne['office'];
-
-// Titre
-
-echo "";
-echo "<big><center><b><strong>Rapport réseau du bureau $office situé au $stage </strong></b></center></big><br><br>";
-//echo $_POST["location"];
-
-$query="SELECT a.name as bureau,b.name as etage,glpi_dropdown_netpoint.name as prise,c.name as port,glpi_networking_wire.id as lien,glpi_networking.name as switch,d.name as portordi, glpi_computers.name as ordi
-FROM glpi_dropdown_netpoint
-LEFT JOIN glpi_dropdown_locations a ON a.id=glpi_dropdown_netpoint.location
-LEFT JOIN glpi_dropdown_locations b ON b.id=a.parentid
-LEFT JOIN glpi_networking_ports c ON c.netpoint=glpi_dropdown_netpoint.id AND c.device_type=2
-LEFT JOIN glpi_networking_wire ON glpi_networking_wire.end2=c.id
-LEFT JOIN glpi_networking ON glpi_networking.id=c.on_device
-LEFT JOIN glpi_networking_ports d ON d.id=glpi_networking_wire.end1 AND d.device_type=1
-LEFT JOIN glpi_computers ON glpi_computers.id=d.on_device
-WHERE a.id=".$_POST["location"]."";
-/*!
- on envoie la requête de selection qui varie selon le choix fait dans la dropdown à la fonction report perso qui
- affiche un rapport en fonction du bureau choisi
-*/
-report_perso("glpi_networking_bureau",$query);
-
-commonFooter();
-?>
diff -Nur web/glpi/glpi/reports/reports/parBureau-list.php~ glpi/reports/reports/parBureau-list.php~
--- web/glpi/glpi/reports/reports/parBureau-list.php~ 2005-02-28 10:10:55.000000000 +0100
+++ glpi/reports/reports/parBureau-list.php~ 1970-01-01 01:00:00.000000000 +0100
@@ -1,111 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
- ----------------------------------------------------------------------
- Original Author of file:
- <?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
- ----------------------------------------------------------------------
- Original Author of file:
- Purpose of file:
- ----------------------------------------------------------------------
-*/
-/*!
- \brief affiche le rapport réseau par bureau
-
-*/
-
-
-
-include ("_relpos.php");
-include($phproot . "/glpi/networking/_relpos.php");
-include ($phproot . "/glpi/includes.php");
-include ($phproot . "/glpi/includes_networking.php");
-checkAuthentication("normal");
-commonHeader("Reports",$_SERVER["PHP_SELF"]);
-
-
-$item_db_name[0]="glpi_dropdow_location";
-
-
-$db = new DB;
-$query2="SELECT a.name as office,b.name as stage
-FROM glpi_dropdown_locations a
-LEFT JOIN glpi_dropdown_locations b ON b.id=a.parentid
-WHERE a.id=".$_POST["location"]."";
-$result = $db->query($query2);
-$ligne = $db->fetch_array($result);
-$stage=$ligne['stage'];
-$office=$ligne['office'];
-
-// Titre
-
-echo "";
-echo "<big><center><b><strong>Rapport réseau du bureau $office situé au $stage </strong></b></center></big><br><br>";
-//echo $_POST["location"];
-
-$query="SELECT a.name as bureau,b.name as etage,glpi_dropdown_netpoint.name as prise,c.name as port,glpi_networking_wire.id as lien,glpi_networking.name as switch,d.name as portordi, glpi_computers.name as ordi
-FROM glpi_dropdown_netpoint
-LEFT JOIN glpi_dropdown_locations a ON a.id=glpi_dropdown_netpoint.location
-LEFT JOIN glpi_dropdown_locations b ON b.id=a.parentid
-LEFT JOIN glpi_networking_ports c ON c.netpoint=glpi_dropdown_netpoint.id AND c.device_type=2
-LEFT JOIN glpi_networking_wire ON glpi_networking_wire.end2=c.id
-LEFT JOIN glpi_networking ON glpi_networking.id=c.on_device
-LEFT JOIN glpi_networking_ports d ON d.id=glpi_networking_wire.end1
-LEFT JOIN glpi_computers ON glpi_computers.id=d.on_device
-WHERE a.id=".$_POST["location"]."";
-/*!
- on envoie la requête de selection qui varie selon le choix fait dans la dropdown à la fonction report perso qui
- affiche un rapport en fonction du bureau choisi
-*/
-report_perso("glpi_networking_bureau",$query);
-
-commonFooter();
-?>
diff -Nur web/glpi/glpi/reports/reports/parBureau.php glpi/reports/reports/parBureau.php
--- web/glpi/glpi/reports/reports/parBureau.php 2005-03-04 10:39:24.000000000 +0100
+++ glpi/reports/reports/parBureau.php 1970-01-01 01:00:00.000000000 +0100
@@ -1,80 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
- ----------------------------------------------------------------------
- Original Author of file:
- Purpose of file:
- ----------------------------------------------------------------------
-*/
-/*!
- \brief affiche la dropdown avec les différents bureaux
-
-*/
-include ("_relpos.php");
-include ($phproot . "/glpi/includes.php");
-
-
-
-checkAuthentication("normal");
-
-commonHeader("Reports",$_SERVER["PHP_SELF"]);
-
-
-
-$db = new DB;
-
-# Titre
-
-
-echo "<form name='form' method='post' action='parBureau-list.php'>";
-
-echo "<div align='center'>";
-echo "<table class='tab_cadre' >";
-echo "<tr><th align='center' colspan='2' ><big><b>Rapport réseau par bureau:</b></big></th></tr>";
-
-// 3. Selection d'affichage pour generer la liste
-
-echo "<tr class='tab_bg_2'>";
-echo "<td align='center' width='300'>";
-echo "<p><b>".$lang["reports"][43]."</b></p> ";
-echo "<tr>";
-echo "<td align='center'>";
-dropdownValue("glpi_dropdown_locations", "location", $mon->fields["location"],1);
-echo "</td></tr>";
-
-
-echo "<tr class='tab_bg_2'><td colspan='2' align='center'><p><input type='submit' value='".$lang["reports"][15]."' class='submit'></p></td></tr>";
-
-
-echo "</table>";
-echo "</div>";
-echo "</form>";
-
-
-
-commonFooter();
-
-?>
diff -Nur web/glpi/glpi/reports/reports/parEtage_list.php glpi/reports/reports/parEtage_list.php
--- web/glpi/glpi/reports/reports/parEtage_list.php 2005-03-07 11:13:17.000000000 +0100
+++ glpi/reports/reports/parEtage_list.php 1970-01-01 01:00:00.000000000 +0100
@@ -1,85 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
- ----------------------------------------------------------------------
- Original Author of file:
- Purpose of file:
- ----------------------------------------------------------------------
-*/
-/*!
- \brief affiche le rapport réseau par etage
-
-*/
-
-
-include ("_relpos.php");
-include($phproot . "/glpi/networking/_relpos.php");
-include ($phproot . "/glpi/includes.php");
-include ($phproot . "/glpi/includes_networking.php");
-checkAuthentication("normal");
-commonHeader("Reports",$_SERVER["PHP_SELF"]);
-
-
-//$item_db_name[0] = "glpi_computers";
-//$item_db_name[1] = "glpi_networking";
-//$item_db_name[2] = "glpi_peripherals";
-$item_db_name[0]="glpi_dropdow_location";
-
-
-$db = new DB;
-$query2="SELECT glpi_dropdown_locations.name as stage
-FROM glpi_dropdown_locations
-WHERE glpi_dropdown_locations.id=".$_POST["location"]."";
-$result = $db->query($query2);
-$ligne = $db->fetch_array($result);
-$stage=$ligne['stage'];
-
-// Titre
-
-echo "";
-echo "<big><center><b><strong>Rapport réseau du $stage </strong></b></center></big><br><br>";
-//echo $_POST["location"];
-//echo $query;
-
-$query="SELECT a.name as bureau,b.name as etage,glpi_dropdown_netpoint.name as prise,c.name as port,glpi_networking_wire.id as lien,glpi_networking.name as switch,d.name as portordi, glpi_computers.name as ordi
-FROM glpi_dropdown_netpoint
-LEFT JOIN glpi_dropdown_locations a ON a.id=glpi_dropdown_netpoint.location
-LEFT JOIN glpi_dropdown_locations b ON b.id=a.parentid
-LEFT JOIN glpi_networking_ports c ON c.netpoint=glpi_dropdown_netpoint.id AND c.device_type=2
-LEFT JOIN glpi_networking_wire ON glpi_networking_wire.end2=c.id
-LEFT JOIN glpi_networking ON glpi_networking.id=c.on_device
-LEFT JOIN glpi_networking_ports d ON d.id=glpi_networking_wire.end1 AND d.device_type=1
-LEFT JOIN glpi_computers ON glpi_computers.id=d.on_device
-WHERE a.parentid=".$_POST["location"]."
-ORDER BY glpi_dropdown_netpoint.name";
-/*!
- on envoie la requête de selection qui varie selon le choix fait dans la dropdown à la fonction report perso qui
- affiche un rapport en fonction de l'étage choisi
-*/
-report_perso("glpi_networking_etage",$query);
-
-commonFooter();
-?>
diff -Nur web/glpi/glpi/reports/reports/parEtage_list.php~ glpi/reports/reports/parEtage_list.php~
--- web/glpi/glpi/reports/reports/parEtage_list.php~ 2005-03-07 11:08:29.000000000 +0100
+++ glpi/reports/reports/parEtage_list.php~ 1970-01-01 01:00:00.000000000 +0100
@@ -1,85 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
- ----------------------------------------------------------------------
- Original Author of file:
- Purpose of file:
- ----------------------------------------------------------------------
-*/
-/*!
- \brief affiche le rapport réseau par etage
-
-*/
-
-
-include ("_relpos.php");
-include($phproot . "/glpi/networking/_relpos.php");
-include ($phproot . "/glpi/includes.php");
-include ($phproot . "/glpi/includes_networking.php");
-checkAuthentication("normal");
-commonHeader("Reports",$_SERVER["PHP_SELF"]);
-
-
-//$item_db_name[0] = "glpi_computers";
-//$item_db_name[1] = "glpi_networking";
-//$item_db_name[2] = "glpi_peripherals";
-$item_db_name[0]="glpi_dropdow_location";
-
-
-$db = new DB;
-$query2="SELECT glpi_dropdown_locations.name as stage
-FROM glpi_dropdown_locations
-WHERE glpi_dropdown_locations.id=".$_POST["location"]."";
-$result = $db->query($query2);
-$ligne = $db->fetch_array($result);
-$stage=$ligne['stage'];
-
-// Titre
-
-echo "";
-echo "<big><center><b><strong>Rapport réseau du $stage </strong></b></center></big><br><br>";
-//echo $_POST["location"];
-//echo $query;
-
-$query="SELECT a.name as bureau,b.name as etage,glpi_dropdown_netpoint.name as prise,c.name as port,glpi_networking_wire.id as lien,glpi_networking.name as switch,d.name as portordi, glpi_computers.name as ordi
-FROM glpi_dropdown_netpoint
-LEFT JOIN glpi_dropdown_locations a ON a.id=glpi_dropdown_netpoint.location
-LEFT JOIN glpi_dropdown_locations b ON b.id=a.parentid
-LEFT JOIN glpi_networking_ports c ON c.netpoint=glpi_dropdown_netpoint.id AND c.device_type=2
-LEFT JOIN glpi_networking_wire ON glpi_networking_wire.end2=c.id
-LEFT JOIN glpi_networking ON glpi_networking.id=c.on_device
-LEFT JOIN glpi_networking_ports d ON d.id=glpi_networking_wire.end1
-LEFT JOIN glpi_computers ON glpi_computers.id=d.on_device
-WHERE a.parentid=".$_POST["location"]."
-ORDER BY glpi_dropdown_netpoint.name";
-/*!
- on envoie la requête de selection qui varie selon le choix fait dans la dropdown à la fonction report perso qui
- affiche un rapport en fonction de l'étage choisi
-*/
-report_perso("glpi_networking_etage",$query);
-
-commonFooter();
-?>
diff -Nur web/glpi/glpi/reports/reports/parEtage.php glpi/reports/reports/parEtage.php
--- web/glpi/glpi/reports/reports/parEtage.php 2005-03-04 10:36:20.000000000 +0100
+++ glpi/reports/reports/parEtage.php 1970-01-01 01:00:00.000000000 +0100
@@ -1,80 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
- ----------------------------------------------------------------------
- Original Author of file:
- Purpose of file:
- ----------------------------------------------------------------------
-*/
-/*!
- \brief affiche la dropdown avec les différents étages
-
-*/
-include ("_relpos.php");
-include ($phproot . "/glpi/includes.php");
-
-
-
-checkAuthentication("normal");
-
-commonHeader("Reports",$_SERVER["PHP_SELF"]);
-
-
-
-$db = new DB;
-
-# Titre
-
-
-echo "<form name='form' method='post' action='parEtage_list.php'>";
-
-echo "<div align='center'>";
-echo "<table class='tab_cadre' >";
-echo "<tr><th align='center' colspan='2' ><big><b>Rapport réseau par étage:</b></big></th></tr>";
-
-// 3. Selection d'affichage pour generer la liste
-
-echo "<tr class='tab_bg_2'>";
-echo "<td align='center' width='300'>";
-echo "<p><b>".$lang["reports"][34]."</b></p> ";
-echo "<tr>";
-echo "<td align='center'>";
-dropdownvalueSearch("glpi_dropdown_locations","location",$mon->fields["location"],0);
-echo "</td></tr>";
-
-
-echo "<tr class='tab_bg_2'><td colspan='2' align='center'><p><input type='submit' value='".$lang["reports"][15]."' class='submit'></p></td></tr>";
-
-
-echo "</table>";
-echo "</div>";
-echo "</form>";
-
-
-
-commonFooter();
-
-?>
diff -Nur web/glpi/glpi/reports/reports/parPrises-list.php glpi/reports/reports/parPrises-list.php
--- web/glpi/glpi/reports/reports/parPrises-list.php 2005-03-07 11:51:42.000000000 +0100
+++ glpi/reports/reports/parPrises-list.php 1970-01-01 01:00:00.000000000 +0100
@@ -1,90 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
- ----------------------------------------------------------------------
- Original Author of file:
- Purpose of file:
- ----------------------------------------------------------------------
-*/
-/*!
- \brief affiche le rapport réseau par switch
-
-*/
-
-
-
-include ("_relpos.php");
-include($phproot . "/glpi/networking/_relpos.php");
-include ($phproot . "/glpi/includes.php");
-include ($phproot . "/glpi/includes_networking.php");
-checkAuthentication("normal");
-commonHeader("Reports",$_SERVER["PHP_SELF"]);
-
-
-//$item_db_name[0] = "glpi_computers";
-//$item_db_name[1] = "glpi_networking";
-//$item_db_name[2] = "glpi_peripherals";
-$item_db_name[0]="glpi_dropdow_location";
-
-
-$db = new DB;
-$query2="SELECT a.name as office,b.name as stage,glpi_dropdown_netpoint.name as prise
-FROM glpi_dropdown_netpoint
-LEFT JOIN glpi_dropdown_locations a ON a.id=glpi_dropdown_netpoint.location
-LEFT JOIN glpi_dropdown_locations b ON b.id=a.parentid
-WHERE glpi_dropdown_netpoint.id=".$_POST["prise"]."";
-$result = $db->query($query2);
-$ligne = $db->fetch_array($result);
-$prise=$ligne['prise'];
-$stage=$ligne['stage'];
-$office=$ligne['office'];
-
-// Titre
-
-echo "";
-echo "<big><center><b><strong>Rapport réseau de la prise $prise se trouvant dans le bureau $office du $stage</strong></center></b></big><br><br>";
-//echo $_POST["prise"];
-
-
-$query="SELECT a.name as bureau,b.name as etage,glpi_dropdown_netpoint.name as prise,c.name as port,glpi_networking_wire.id as lien,glpi_networking.name as switch,d.name as portordi,glpi_computers.name as ordi
-FROM glpi_dropdown_netpoint
-LEFT JOIN glpi_dropdown_locations a ON a.id=glpi_dropdown_netpoint.location
-LEFT JOIN glpi_dropdown_locations b ON b.id=a.parentid
-LEFT JOIN glpi_networking_ports c ON c.netpoint=glpi_dropdown_netpoint.id AND c.device_type=2
-LEFT JOIN glpi_networking_wire ON glpi_networking_wire.end2=c.id
-LEFT JOIN glpi_networking ON glpi_networking.id=c.on_device
-LEFT JOIN glpi_networking_ports d ON d.id=glpi_networking_wire.end1 AND d.device_type=1
-LEFT JOIN glpi_computers ON glpi_computers.id=d.on_device
-WHERE glpi_dropdown_netpoint.id=".$_POST["prise"]."";
-
-/*!
- on envoie la requête de selection qui varie selon le choix fait dans la dropdown à la fonction report perso qui
- affiche un rapport en fonction de la prise choisie
-*/
-report_perso("glpi_networking_prise",$query);
-
-commonFooter();
-?>
diff -Nur web/glpi/glpi/reports/reports/parPrises-list.php~ glpi/reports/reports/parPrises-list.php~
--- web/glpi/glpi/reports/reports/parPrises-list.php~ 2005-02-28 10:11:22.000000000 +0100
+++ glpi/reports/reports/parPrises-list.php~ 1970-01-01 01:00:00.000000000 +0100
@@ -1,90 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
- ----------------------------------------------------------------------
- Original Author of file:
- Purpose of file:
- ----------------------------------------------------------------------
-*/
-/*!
- \brief affiche le rapport réseau par switch
-
-*/
-
-
-
-include ("_relpos.php");
-include($phproot . "/glpi/networking/_relpos.php");
-include ($phproot . "/glpi/includes.php");
-include ($phproot . "/glpi/includes_networking.php");
-checkAuthentication("normal");
-commonHeader("Reports",$_SERVER["PHP_SELF"]);
-
-
-//$item_db_name[0] = "glpi_computers";
-//$item_db_name[1] = "glpi_networking";
-//$item_db_name[2] = "glpi_peripherals";
-$item_db_name[0]="glpi_dropdow_location";
-
-
-$db = new DB;
-$query2="SELECT a.name as office,b.name as stage,glpi_dropdown_netpoint.name as prise
-FROM glpi_dropdown_netpoint
-LEFT JOIN glpi_dropdown_locations a ON a.id=glpi_dropdown_netpoint.location
-LEFT JOIN glpi_dropdown_locations b ON b.id=a.parentid
-WHERE glpi_dropdown_netpoint.id=".$_POST["prise"]."";
-$result = $db->query($query2);
-$ligne = $db->fetch_array($result);
-$prise=$ligne['prise'];
-$stage=$ligne['stage'];
-$office=$ligne['office'];
-
-// Titre
-
-echo "";
-echo "<big><center><b><strong>Rapport réseau de la prise $prise se trouvant dans le bureau $office du $stage</strong></center></b></big><br><br>";
-//echo $_POST["prise"];
-
-
-$query="SELECT a.name as bureau,b.name as etage,glpi_dropdown_netpoint.name as prise,c.name as port,glpi_networking_wire.id as lien,glpi_networking.name as switch,d.name as portordi,glpi_computers.name as ordi
-FROM glpi_dropdown_netpoint
-LEFT JOIN glpi_dropdown_locations a ON a.id=glpi_dropdown_netpoint.location
-LEFT JOIN glpi_dropdown_locations b ON b.id=a.parentid
-LEFT JOIN glpi_networking_ports c ON c.netpoint=glpi_dropdown_netpoint.id AND c.device_type=2
-LEFT JOIN glpi_networking_wire ON glpi_networking_wire.end2=c.id
-LEFT JOIN glpi_networking ON glpi_networking.id=c.on_device
-LEFT JOIN glpi_networking_ports d ON d.id=glpi_networking_wire.end1
-LEFT JOIN glpi_computers ON glpi_computers.id=d.on_device
-WHERE glpi_dropdown_netpoint.id=".$_POST["prise"]."";
-
-/*!
- on envoie la requête de selection qui varie selon le choix fait dans la dropdown à la fonction report perso qui
- affiche un rapport en fonction de la prise choisie
-*/
-report_perso("glpi_networking_prise",$query);
-
-commonFooter();
-?>
diff -Nur web/glpi/glpi/reports/reports/parPrises.php glpi/reports/reports/parPrises.php
--- web/glpi/glpi/reports/reports/parPrises.php 2005-02-28 16:35:17.000000000 +0100
+++ glpi/reports/reports/parPrises.php 1970-01-01 01:00:00.000000000 +0100
@@ -1,79 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
- ----------------------------------------------------------------------
- Original Author of file:
- Purpose of file:
- ----------------------------------------------------------------------
-*/
-/*!
- \brief affiche la dropdown avec les différentes prises
-*/
-include ("_relpos.php");
-include ($phproot . "/glpi/includes.php");
-
-
-
-checkAuthentication("normal");
-
-commonHeader("Reports",$_SERVER["PHP_SELF"]);
-
-
-
-$db = new DB;
-
-# Titre
-
-
-echo "<form name='form' method='post' action='parPrises-list.php'>";
-
-echo "<div align='center'>";
-echo "<table class='tab_cadre' >";
-echo "<tr><th align='center' colspan='2' ><big><b>Rapport réseau par prises:</b></big></th></tr>";
-
-// 3. Selection d'affichage pour generer la liste
-
-echo "<tr class='tab_bg_2'>";
-echo "<td align='center' width='300'>";
-echo "<p><b>".$lang["reports"][44]."</b></p> ";
-echo "<tr>";
-echo "<td align='center'>";
-dropdownValue("glpi_dropdown_netpoint", "prise", $mon->fields["switch"]);
-echo "</td></tr>";
-
-
-echo "<tr class='tab_bg_2'><td colspan='2' align='center'><p><input type='submit' value='".$lang["reports"][15]."' class='submit'></p></td></tr>";
-
-
-echo "</table>";
-echo "</div>";
-echo "</form>";
-
-
-
-commonFooter();
-
-?>
diff -Nur web/glpi/glpi/reports/reports/parSwitch-list.php glpi/reports/reports/parSwitch-list.php
--- web/glpi/glpi/reports/reports/parSwitch-list.php 2005-03-07 11:52:50.000000000 +0100
+++ glpi/reports/reports/parSwitch-list.php 1970-01-01 01:00:00.000000000 +0100
@@ -1,85 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
- ----------------------------------------------------------------------
- Original Author of file:
- Purpose of file:
- ----------------------------------------------------------------------
-*/
-/*!
- \brief affiche le rapport réseau par switch
-
-*/
-
-
-
-include ("_relpos.php");
-include($phproot . "/glpi/networking/_relpos.php");
-include ($phproot . "/glpi/includes.php");
-include ($phproot . "/glpi/includes_networking.php");
-checkAuthentication("normal");
-commonHeader("Reports",$_SERVER["PHP_SELF"]);
-
-
-//$item_db_name[0] = "glpi_computers";
-//$item_db_name[1] = "glpi_networking";
-//$item_db_name[2] = "glpi_peripherals";
-$item_db_name[0]="glpi_dropdow_location";
-
-
-$db = new DB;
-$query2="SELECT glpi_networking.name as switch
-FROM glpi_networking
-WHERE glpi_networking.id=".$_POST["switch"]."";
-$result = $db->query($query2);
-$ligne = $db->fetch_array($result);
-$switch=$ligne['switch'];
-
-// Titre
-
-echo "";
-echo "<big><center><b><strong>Rapport réseau du switch $switch </strong></b></center></big><br><br>";
-//echo $_POST["switch"];
-
-$query="SELECT a.name as bureau,b.name as etage,glpi_dropdown_netpoint.name as prise,c.name as port,glpi_networking_wire.id as lien,glpi_networking.name as switch,d.name as portordi,glpi_computers.name as ordi
-FROM glpi_dropdown_netpoint
-LEFT JOIN glpi_dropdown_locations a ON a.id=glpi_dropdown_netpoint.location
-LEFT JOIN glpi_dropdown_locations b ON b.id=a.parentid
-LEFT JOIN glpi_networking_ports c ON c.netpoint=glpi_dropdown_netpoint.id AND c.device_type=2
-LEFT JOIN glpi_networking_wire ON glpi_networking_wire.end2=c.id
-LEFT JOIN glpi_networking ON glpi_networking.id=c.on_device
-LEFT JOIN glpi_networking_ports d ON d.id=glpi_networking_wire.end1 AND d.device_type=1
-LEFT JOIN glpi_computers ON glpi_computers.id=d.on_device
-WHERE glpi_networking.id=".$_POST["switch"]."";
-/*!
- on envoie la requête de selection qui varie selon le choix fait dans la dropdown à la fonction report perso qui
- affiche un rapport en fonction du switch choisi
-*/
-
-report_perso("glpi_networking_switch",$query);
-
-commonFooter();
-?>
diff -Nur web/glpi/glpi/reports/reports/parSwitch-list.php~ glpi/reports/reports/parSwitch-list.php~
--- web/glpi/glpi/reports/reports/parSwitch-list.php~ 2005-02-28 10:11:10.000000000 +0100
+++ glpi/reports/reports/parSwitch-list.php~ 1970-01-01 01:00:00.000000000 +0100
@@ -1,85 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
- ----------------------------------------------------------------------
- Original Author of file:
- Purpose of file:
- ----------------------------------------------------------------------
-*/
-/*!
- \brief affiche le rapport réseau par switch
-
-*/
-
-
-
-include ("_relpos.php");
-include($phproot . "/glpi/networking/_relpos.php");
-include ($phproot . "/glpi/includes.php");
-include ($phproot . "/glpi/includes_networking.php");
-checkAuthentication("normal");
-commonHeader("Reports",$_SERVER["PHP_SELF"]);
-
-
-//$item_db_name[0] = "glpi_computers";
-//$item_db_name[1] = "glpi_networking";
-//$item_db_name[2] = "glpi_peripherals";
-$item_db_name[0]="glpi_dropdow_location";
-
-
-$db = new DB;
-$query2="SELECT glpi_networking.name as switch
-FROM glpi_networking
-WHERE glpi_networking.id=".$_POST["switch"]."";
-$result = $db->query($query2);
-$ligne = $db->fetch_array($result);
-$switch=$ligne['switch'];
-
-// Titre
-
-echo "";
-echo "<big><center><b><strong>Rapport réseau du switch $switch </strong></b></center></big><br><br>";
-//echo $_POST["switch"];
-
-$query="SELECT a.name as bureau,b.name as etage,glpi_dropdown_netpoint.name as prise,c.name as port,glpi_networking_wire.id as lien,glpi_networking.name as switch,d.name as portordi,glpi_computers.name as ordi
-FROM glpi_dropdown_netpoint
-LEFT JOIN glpi_dropdown_locations a ON a.id=glpi_dropdown_netpoint.location
-LEFT JOIN glpi_dropdown_locations b ON b.id=a.parentid
-LEFT JOIN glpi_networking_ports c ON c.netpoint=glpi_dropdown_netpoint.id AND c.device_type=2
-LEFT JOIN glpi_networking_wire ON glpi_networking_wire.end2=c.id
-LEFT JOIN glpi_networking ON glpi_networking.id=c.on_device
-LEFT JOIN glpi_networking_ports d ON d.id=glpi_networking_wire.end1
-LEFT JOIN glpi_computers ON glpi_computers.id=d.on_device
-WHERE glpi_networking.id=".$_POST["switch"]."";
-/*!
- on envoie la requête de selection qui varie selon le choix fait dans la dropdown à la fonction report perso qui
- affiche un rapport en fonction du switch choisi
-*/
-
-report_perso("glpi_networking_switch",$query);
-
-commonFooter();
-?>
diff -Nur web/glpi/glpi/reports/reports/parSwitch.php glpi/reports/reports/parSwitch.php
--- web/glpi/glpi/reports/reports/parSwitch.php 2005-02-28 10:06:03.000000000 +0100
+++ glpi/reports/reports/parSwitch.php 1970-01-01 01:00:00.000000000 +0100
@@ -1,80 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
- ----------------------------------------------------------------------
- Original Author of file:
- Purpose of file:
- ----------------------------------------------------------------------
-*/
-/*!
- \brief affiche la dropdown avec les différents switch
-
-*/
-include ("_relpos.php");
-include ($phproot . "/glpi/includes.php");
-
-
-
-checkAuthentication("normal");
-
-commonHeader("Reports",$_SERVER["PHP_SELF"]);
-
-
-
-$db = new DB;
-
-# Titre
-
-
-echo "<form name='form' method='post' action='parSwitch-list.php'>";
-
-echo "<div align='center'>";
-echo "<table class='tab_cadre' >";
-echo "<tr><th align='center' colspan='2' ><big><b>Rapport réseau par switch:</b></big></th></tr>";
-
-// 3. Selection d'affichage pour generer la liste
-
-echo "<tr class='tab_bg_2'>";
-echo "<td align='center' width='300'>";
-echo "<p><b>".$lang["reports"][42]."</b></p> ";
-echo "<tr>";
-echo "<td align='center'>";
-dropdownValue("glpi_networking", "switch", $mon->fields["switch"]);
-echo "</td></tr>";
-
-
-echo "<tr class='tab_bg_2'><td colspan='2' align='center'><p><input type='submit' value='".$lang["reports"][15]."' class='submit'></p></td></tr>";
-
-
-echo "</table>";
-echo "</div>";
-echo "</form>";
-
-
-
-commonFooter();
-
-?>
diff -Nur web/glpi/glpi/reports/reports/phpexcel/CVS/Entries glpi/reports/reports/phpexcel/CVS/Entries
--- web/glpi/glpi/reports/reports/phpexcel/CVS/Entries 1970-01-01 01:00:00.000000000 +0100
+++ glpi/reports/reports/phpexcel/CVS/Entries 2005-03-07 14:03:06.000000000 +0100
@@ -0,0 +1 @@
+D
diff -Nur web/glpi/glpi/reports/reports/phpexcel/CVS/Repository glpi/reports/reports/phpexcel/CVS/Repository
--- web/glpi/glpi/reports/reports/phpexcel/CVS/Repository 1970-01-01 01:00:00.000000000 +0100
+++ glpi/reports/reports/phpexcel/CVS/Repository 2005-03-07 14:03:06.000000000 +0100
@@ -0,0 +1 @@
+glpi/reports/reports/phpexcel
diff -Nur web/glpi/glpi/reports/reports/phpexcel/CVS/Root glpi/reports/reports/phpexcel/CVS/Root
--- web/glpi/glpi/reports/reports/phpexcel/CVS/Root 1970-01-01 01:00:00.000000000 +0100
+++ glpi/reports/reports/phpexcel/CVS/Root 2005-03-07 14:03:06.000000000 +0100
@@ -0,0 +1 @@
+:pserver:[EMAIL PROTECTED]
diff -Nur web/glpi/glpi/reports/reports/rapport-sylk.php glpi/reports/reports/rapport-sylk.php
--- web/glpi/glpi/reports/reports/rapport-sylk.php 2005-02-12 23:17:22.000000000 +0100
+++ glpi/reports/reports/rapport-sylk.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
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
-
+ ------------------------------------------------------------------------
*/
diff -Nur web/glpi/glpi/reports/reports/_relpos.php glpi/reports/reports/_relpos.php
--- web/glpi/glpi/reports/reports/_relpos.php 2005-02-12 17:00:11.000000000 +0100
+++ glpi/reports/reports/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/reports/reports/reseau.php glpi/reports/reports/reseau.php
--- web/glpi/glpi/reports/reports/reseau.php 2005-02-28 10:28:50.000000000 +0100
+++ glpi/reports/reports/reseau.php 1970-01-01 01:00:00.000000000 +0100
@@ -1,89 +0,0 @@
-<?php
-/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
-
- http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
- LICENSE
-
-This file is part of GLPI.
-
- GLPI is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GLPI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- 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
- ----------------------------------------------------------------------
- Original Author of file:
- Purpose of file:
- ----------------------------------------------------------------------
-*/
-/*!
- \brief affiche les diffents choix de rapports reseaux
-
-*/
-include ("_relpos.php");
-include ($phproot . "/glpi/includes.php");
-
-
-
-checkAuthentication("normal");
-
-commonHeader("Reports",$_SERVER["PHP_SELF"]);
-
-
-
-$db = new DB;
-
-# Titre
-
-
-
-echo "<div align='center'>";
-echo "<table class='tab_cadre' >";
-echo "<tr><th align='center' colspan='2' ><big><b>Rapport réseau par:</b></big></th></tr>";
-
-// 3. Selection d'affichage pour generer la liste
-
-
-$report_list["etage"]["name"] = $lang["reports"][39];
-$report_list["etage"]["file"] = "parEtage.php";
-$report_list["bureau"]["name"] = $lang["reports"][40];
-$report_list["bureau"]["file"] = "parBureau.php";
-$report_list["switch"]["name"] = $lang["reports"][41];
-$report_list["switch"]["file"] = "parSwitch.php";
-$report_list["prise"]["name"] = $lang["reports"][37];
-$report_list["prise"]["file"] = "parPrises.php";
-
-
-
-$i = 0;
-$count = count($report_list);
-while($data = each($report_list)) {
- $val = $data[0];
- $name = $report_list["$val"]["name"];
- $file = $report_list["$val"]["file"];
- echo "<tr class='tab_bg_1'><td align='center' colspan='2'><a href=\"$file\"><b>$name</b></a></td></tr>";
- $i++;
-}
-echo "</table>";
-echo "</div>";
-
-echo "</form>";
-
-
-
-commonFooter();
-
-?>
diff -Nur web/glpi/glpi/reports/reports/tracking.php glpi/reports/reports/tracking.php
--- web/glpi/glpi/reports/reports/tracking.php 2005-02-12 21:46:59.000000000 +0100
+++ glpi/reports/reports/tracking.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,29 +1,30 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- GLPI is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+ GLPI is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
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
- ----------------------------------------------------------------------
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/reservation/CVS/Entries glpi/reservation/CVS/Entries
--- web/glpi/glpi/reservation/CVS/Entries 2005-03-04 09:46:05.000000000 +0100
+++ glpi/reservation/CVS/Entries 2005-03-07 14:03:06.000000000 +0100
@@ -1,3 +1,3 @@
-/_relpos.php/1.2/Sat Feb 12 16:00:11 2005//
-/index.php/1.14/Tue Mar 1 23:05:59 2005//
+/_relpos.php/1.3/Mon Mar 7 10:44:25 2005//
+/index.php/1.15/Mon Mar 7 10:44:25 2005//
D
diff -Nur web/glpi/glpi/reservation/index.php glpi/reservation/index.php
--- web/glpi/glpi/reservation/index.php 2005-03-02 00:05:59.000000000 +0100
+++ glpi/reservation/index.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/reservation/_relpos.php glpi/reservation/_relpos.php
--- web/glpi/glpi/reservation/_relpos.php 2005-02-12 17:00:11.000000000 +0100
+++ glpi/reservation/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/setup/CVS/Entries glpi/setup/CVS/Entries
--- web/glpi/glpi/setup/CVS/Entries 2005-03-07 09:57:36.000000000 +0100
+++ glpi/setup/CVS/Entries 2005-03-07 14:03:07.000000000 +0100
@@ -1,11 +1,11 @@
-/_relpos.php/1.4/Sat Feb 12 16:00:11 2005//
-/setup-assign-job.php/1.11/Sun Feb 13 19:07:22 2005//
-/setup-config.php/1.19/Sat Feb 12 18:57:28 2005//
-/setup-users.php/1.14/Sat Feb 12 18:57:28 2005//
-/users-info-form.php/1.9/Sun Feb 13 19:07:22 2005//
-/users-info.php/1.13/Sat Feb 12 18:57:28 2005//
-/users-search.php/1.6/Sat Feb 12 18:57:28 2005//
-/index.php/1.21/Mon Mar 7 08:57:36 2005//
-/setup-dropdowns.php/1.30/Mon Mar 7 08:57:36 2005//
-/setup-templates.php/1.20/Mon Mar 7 08:57:36 2005//
+/_relpos.php/1.5/Mon Mar 7 10:44:25 2005//
+/index.php/1.22/Mon Mar 7 10:44:25 2005//
+/setup-assign-job.php/1.12/Mon Mar 7 10:44:25 2005//
+/setup-config.php/1.20/Mon Mar 7 10:44:25 2005//
+/setup-dropdowns.php/1.31/Mon Mar 7 10:44:25 2005//
+/setup-templates.php/1.21/Mon Mar 7 10:44:25 2005//
+/setup-users.php/1.15/Mon Mar 7 10:44:25 2005//
+/users-info-form.php/1.10/Mon Mar 7 10:44:25 2005//
+/users-info.php/1.14/Mon Mar 7 10:44:25 2005//
+/users-search.php/1.7/Mon Mar 7 10:44:25 2005//
D
diff -Nur web/glpi/glpi/setup/index.php glpi/setup/index.php
--- web/glpi/glpi/setup/index.php 2005-03-07 09:57:36.000000000 +0100
+++ glpi/setup/index.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/setup/_relpos.php glpi/setup/_relpos.php
--- web/glpi/glpi/setup/_relpos.php 2005-02-12 17:00:11.000000000 +0100
+++ glpi/setup/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/setup/setup-assign-job.php glpi/setup/setup-assign-job.php
--- web/glpi/glpi/setup/setup-assign-job.php 2005-02-13 20:07:22.000000000 +0100
+++ glpi/setup/setup-assign-job.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/setup/setup-config.php glpi/setup/setup-config.php
--- web/glpi/glpi/setup/setup-config.php 2005-02-12 19:57:28.000000000 +0100
+++ glpi/setup/setup-config.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
- LICENSE
-This file is part of GLPI.
+ LICENSE
+
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/setup/setup-dropdowns.php glpi/setup/setup-dropdowns.php
--- web/glpi/glpi/setup/setup-dropdowns.php 2005-03-07 09:57:36.000000000 +0100
+++ glpi/setup/setup-dropdowns.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/setup/setup-templates.php glpi/setup/setup-templates.php
--- web/glpi/glpi/setup/setup-templates.php 2005-03-07 09:57:36.000000000 +0100
+++ glpi/setup/setup-templates.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/setup/setup-users.php glpi/setup/setup-users.php
--- web/glpi/glpi/setup/setup-users.php 2005-02-12 19:57:28.000000000 +0100
+++ glpi/setup/setup-users.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/setup/users-info-form.php glpi/setup/users-info-form.php
--- web/glpi/glpi/setup/users-info-form.php 2005-02-13 20:07:22.000000000 +0100
+++ glpi/setup/users-info-form.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/setup/users-info.php glpi/setup/users-info.php
--- web/glpi/glpi/setup/users-info.php 2005-02-12 19:57:28.000000000 +0100
+++ glpi/setup/users-info.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/setup/users-search.php glpi/setup/users-search.php
--- web/glpi/glpi/setup/users-search.php 2005-02-12 19:57:28.000000000 +0100
+++ glpi/setup/users-search.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/software/CVS/Entries glpi/software/CVS/Entries
--- web/glpi/glpi/software/CVS/Entries 2005-03-07 09:57:36.000000000 +0100
+++ glpi/software/CVS/Entries 2005-03-07 14:03:07.000000000 +0100
@@ -1,7 +1,7 @@
-/_relpos.php/1.4/Sat Feb 12 16:00:11 2005//
-/index.php/1.13/Thu Mar 3 17:38:59 2005//
-/software-licenses.php/1.21/Sat Feb 19 00:57:52 2005//
-/software-search.php/1.16/Thu Mar 3 17:38:59 2005//
-/software-add-select.php/1.1/Sun Mar 6 23:10:07 2005//
-/software-info-form.php/1.26/Mon Mar 7 08:57:36 2005//
+/_relpos.php/1.5/Mon Mar 7 10:44:25 2005//
+/index.php/1.14/Mon Mar 7 10:44:25 2005//
+/software-add-select.php/1.2/Mon Mar 7 10:44:25 2005//
+/software-info-form.php/1.27/Mon Mar 7 10:44:25 2005//
+/software-licenses.php/1.22/Mon Mar 7 10:44:25 2005//
+/software-search.php/1.17/Mon Mar 7 10:44:25 2005//
D
diff -Nur web/glpi/glpi/software/index.php glpi/software/index.php
--- web/glpi/glpi/software/index.php 2005-03-03 18:38:59.000000000 +0100
+++ glpi/software/index.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/software/_relpos.php glpi/software/_relpos.php
--- web/glpi/glpi/software/_relpos.php 2005-02-12 17:00:11.000000000 +0100
+++ glpi/software/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/software/software-add-select.php glpi/software/software-add-select.php
--- web/glpi/glpi/software/software-add-select.php 2005-03-07 00:10:07.000000000 +0100
+++ glpi/software/software-add-select.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/software/software-info-form.php glpi/software/software-info-form.php
--- web/glpi/glpi/software/software-info-form.php 2005-03-07 09:57:36.000000000 +0100
+++ glpi/software/software-info-form.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/software/software-licenses.php glpi/software/software-licenses.php
--- web/glpi/glpi/software/software-licenses.php 2005-02-19 01:57:52.000000000 +0100
+++ glpi/software/software-licenses.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/software/software-search.php glpi/software/software-search.php
--- web/glpi/glpi/software/software-search.php 2005-03-03 18:38:59.000000000 +0100
+++ glpi/software/software-search.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/stats/CVS/Entries glpi/stats/CVS/Entries
--- web/glpi/glpi/stats/CVS/Entries 2005-03-04 09:46:06.000000000 +0100
+++ glpi/stats/CVS/Entries 2005-03-07 14:03:07.000000000 +0100
@@ -1,9 +1,9 @@
-/_relpos.php/1.4/Sat Feb 12 16:00:11 2005//
-/functions.php/1.23/Sat Feb 12 16:00:11 2005//
-/globales.php/1.7/Sat Feb 12 18:57:28 2005//
-/index.php/1.10/Sat Feb 12 18:57:28 2005//
-/stat_global.php/1.14/Tue Mar 1 23:05:59 2005//
-/stat_lieux.php/1.27/Tue Mar 1 23:05:59 2005//
-/stat_technicien.php/1.20/Tue Mar 1 23:05:59 2005//
-/stat_user.php/1.20/Tue Mar 1 23:05:59 2005//
+/_relpos.php/1.5/Mon Mar 7 10:44:25 2005//
+/functions.php/1.24/Mon Mar 7 10:44:25 2005//
+/globales.php/1.8/Mon Mar 7 10:44:25 2005//
+/index.php/1.11/Mon Mar 7 10:44:25 2005//
+/stat_global.php/1.15/Mon Mar 7 10:44:25 2005//
+/stat_lieux.php/1.28/Mon Mar 7 10:44:25 2005//
+/stat_technicien.php/1.21/Mon Mar 7 10:44:25 2005//
+/stat_user.php/1.21/Mon Mar 7 10:44:25 2005//
D
diff -Nur web/glpi/glpi/stats/functions.php glpi/stats/functions.php
--- web/glpi/glpi/stats/functions.php 2005-02-12 17:00:11.000000000 +0100
+++ glpi/stats/functions.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/stats/globales.php glpi/stats/globales.php
--- web/glpi/glpi/stats/globales.php 2005-02-12 19:57:28.000000000 +0100
+++ glpi/stats/globales.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/stats/index.php glpi/stats/index.php
--- web/glpi/glpi/stats/index.php 2005-02-12 19:57:28.000000000 +0100
+++ glpi/stats/index.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/stats/_relpos.php glpi/stats/_relpos.php
--- web/glpi/glpi/stats/_relpos.php 2005-02-12 17:00:11.000000000 +0100
+++ glpi/stats/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/stats/stat_global.php glpi/stats/stat_global.php
--- web/glpi/glpi/stats/stat_global.php 2005-03-02 00:05:59.000000000 +0100
+++ glpi/stats/stat_global.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/stats/stat_lieux.php glpi/stats/stat_lieux.php
--- web/glpi/glpi/stats/stat_lieux.php 2005-03-02 00:05:59.000000000 +0100
+++ glpi/stats/stat_lieux.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/stats/stat_technicien.php glpi/stats/stat_technicien.php
--- web/glpi/glpi/stats/stat_technicien.php 2005-03-02 00:05:59.000000000 +0100
+++ glpi/stats/stat_technicien.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/stats/stat_user.php glpi/stats/stat_user.php
--- web/glpi/glpi/stats/stat_user.php 2005-03-02 00:05:59.000000000 +0100
+++ glpi/stats/stat_user.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/tracking/CVS/Entries glpi/tracking/CVS/Entries
--- web/glpi/glpi/tracking/CVS/Entries 2005-03-04 09:46:06.000000000 +0100
+++ glpi/tracking/CVS/Entries 2005-03-07 14:03:07.000000000 +0100
@@ -1,10 +1,10 @@
-/_relpos.php/1.4/Sat Feb 12 16:00:11 2005//
-/index.php/1.24/Mon Feb 14 13:45:34 2005//
-/tracking-add-form.php/1.24/Wed Mar 2 00:05:28 2005//
-/tracking-assign-form.php/1.15/Sun Feb 13 19:07:22 2005//
-/tracking-category-form.php/1.4/Sun Feb 13 19:07:23 2005//
-/tracking-followups.php/1.18/Sat Feb 12 18:57:29 2005//
-/tracking-injector.php/1.21/Sat Feb 12 18:57:29 2005//
-/tracking-mark.php/1.13/Sat Feb 12 16:00:11 2005//
-/tracking-priority-form.php/1.2/Sun Feb 13 19:07:23 2005//
+/_relpos.php/1.5/Mon Mar 7 10:44:25 2005//
+/index.php/1.25/Mon Mar 7 10:44:26 2005//
+/tracking-add-form.php/1.25/Mon Mar 7 10:44:26 2005//
+/tracking-assign-form.php/1.16/Mon Mar 7 10:44:26 2005//
+/tracking-category-form.php/1.5/Mon Mar 7 10:44:26 2005//
+/tracking-followups.php/1.19/Mon Mar 7 10:44:26 2005//
+/tracking-injector.php/1.22/Mon Mar 7 10:44:26 2005//
+/tracking-mark.php/1.14/Mon Mar 7 10:44:26 2005//
+/tracking-priority-form.php/1.3/Mon Mar 7 10:44:26 2005//
D
diff -Nur web/glpi/glpi/tracking/index.php glpi/tracking/index.php
--- web/glpi/glpi/tracking/index.php 2005-02-14 14:45:34.000000000 +0100
+++ glpi/tracking/index.php 2005-03-07 11:44:26.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/tracking/_relpos.php glpi/tracking/_relpos.php
--- web/glpi/glpi/tracking/_relpos.php 2005-02-12 17:00:11.000000000 +0100
+++ glpi/tracking/_relpos.php 2005-03-07 11:44:25.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/tracking/tracking-add-form.php glpi/tracking/tracking-add-form.php
--- web/glpi/glpi/tracking/tracking-add-form.php 2005-03-02 01:05:28.000000000 +0100
+++ glpi/tracking/tracking-add-form.php 2005-03-07 11:44:26.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/tracking/tracking-assign-form.php glpi/tracking/tracking-assign-form.php
--- web/glpi/glpi/tracking/tracking-assign-form.php 2005-02-13 20:07:22.000000000 +0100
+++ glpi/tracking/tracking-assign-form.php 2005-03-07 11:44:26.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/tracking/tracking-category-form.php glpi/tracking/tracking-category-form.php
--- web/glpi/glpi/tracking/tracking-category-form.php 2005-02-13 20:07:23.000000000 +0100
+++ glpi/tracking/tracking-category-form.php 2005-03-07 11:44:26.000000000 +0100
@@ -1,14 +1,15 @@
<?php
/*
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/tracking/tracking-followups.php glpi/tracking/tracking-followups.php
--- web/glpi/glpi/tracking/tracking-followups.php 2005-02-12 19:57:29.000000000 +0100
+++ glpi/tracking/tracking-followups.php 2005-03-07 11:44:26.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/tracking/tracking-injector.php glpi/tracking/tracking-injector.php
--- web/glpi/glpi/tracking/tracking-injector.php 2005-02-12 19:57:29.000000000 +0100
+++ glpi/tracking/tracking-injector.php 2005-03-07 11:44:26.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/tracking/tracking-mark.php glpi/tracking/tracking-mark.php
--- web/glpi/glpi/tracking/tracking-mark.php 2005-02-12 17:00:11.000000000 +0100
+++ glpi/tracking/tracking-mark.php 2005-03-07 11:44:26.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// Based on:
diff -Nur web/glpi/glpi/tracking/tracking-priority-form.php glpi/tracking/tracking-priority-form.php
--- web/glpi/glpi/tracking/tracking-priority-form.php 2005-02-13 20:07:23.000000000 +0100
+++ glpi/tracking/tracking-priority-form.php 2005-03-07 11:44:26.000000000 +0100
@@ -1,14 +1,15 @@
<?php
/*
- ----------------------------------------------------------------------
-GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ ----------------------------------------------------------------------
+ GLPI - Gestionnaire Libre de Parc Informatique
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,6 +24,7 @@
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
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/update_content.php glpi/update_content.php
--- web/glpi/glpi/update_content.php 2005-02-12 17:00:10.000000000 +0100
+++ glpi/update_content.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
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
-
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
diff -Nur web/glpi/glpi/update.php glpi/update.php
--- web/glpi/glpi/update.php 2005-03-07 09:57:34.000000000 +0100
+++ glpi/update.php 2005-03-07 11:44:24.000000000 +0100
@@ -1,15 +1,15 @@
<?php
/*
-
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
- Copyright (C) 2004 by the INDEPNET Development Team.
+ Copyright (C) 2003-2005 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi.indepnet.org
- ----------------------------------------------------------------------
+ ----------------------------------------------------------------------
+
LICENSE
-This file is part of GLPI.
+ This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
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
-
+ ------------------------------------------------------------------------
*/
// ----------------------------------------------------------------------
