Ok, first of all i've started to look into the code, and i've found a
major problem that i think is better to solve.
After a successful IMAP/POP3 login, the (good) password are saved in
the glpi database.
A sysadmin tipically use IMAP for login to have centralized account
(and password) management.
Ok, password stored on glpi database are cypted, but i think is much
safer to have the password not saved at all, preserving the idea of a
single source of authentication.
In my hackish patch i've simply put the password to '', need to be
added some code to prevent the authentication in DB if password is
null/empty.
Ok, patch attached. I've add a function that do ldap auth, and a
function that load from ldap user data (i think in wrong class ;), add
some missed field and add all to users table.
I think that this is suboptimal, i'm thinking about a structure like
this, in pseudocode:
// here we do only auth
//
auth_succeded=false;
if connection_imap(user, pass)
auth_succeded=imap;
if !auth_succeded && connection_ldap(user, pass)
auth_succeded=ldap;
if !auth_succeded && connection_db(user, pass)
auth_succeded=db;
// now we have the auth. So we can load user data...
// in order we have imap as source of little data, ldap some more and
// db all. we try in order
user->load_default(user);
if (auth_succeded == imap)
user->load_imap();
user->update_or_save(field_list);
else if (auth_succeded == ldap)
user->load_ldap();
user->update_or_save(field_list);
else if (auth_succeded == db)
user->load_db();
i think the mean of the functions is clear.
update_or_save() do as intended, the field_list simply mark the filed
that are authoritative for that source (eg, for imap only the email,
for ldap all apart type and can_assign_job.
I think that the connection_* could be simply some functions, but also
member of Identification class, where the load_* have to be member of
user class.
Say me something.
--
dott. Marco Gaiarin GNUPG Key ID: 240A3D66
Associazione ``La Nostra Famiglia'' http://www.sv.lnf.it/
Polo FVG - Via della Bontà, 7 - 33078 - San Vito al Tagliamento (PN)
gaio(at)sv.lnf.it tel +39-0434-842711 fax +39-0434-842797
... votantoniovotantoniovotantoniovotantoniovotantoniovotantonio ...
resistenza arcobaleno contro la politica grigia
http://www.peacelink.it/votantonio
diff -udr cvs/computers/CVS/Entries dev/computers/CVS/Entries
--- cvs/computers/CVS/Entries 2004-05-26 16:14:53.000000000 +0200
+++ dev/computers/CVS/Entries 2004-05-26 16:15:23.000000000 +0200
@@ -1,8 +1,8 @@
/calendrier.html/1.1/Sat Sep 6 18:20:19 2003//
/_relpos.php/1.1/Thu May 6 16:15:02 2004//
/computers-search.php/1.7/Thu May 6 16:15:02 2004//
-/computers-info-form.php/1.8/Wed May 26 14:14:47 2004//
-/index.php/1.5/Wed May 26 14:14:47 2004//
-/mycalendar.php/1.3/Wed May 26 14:14:47 2004//
-/computers-add-select.php/1.6/Wed May 26 14:14:52 2004//
+/computers-info-form.php/1.8/Wed May 26 14:15:19 2004//
+/index.php/1.5/Wed May 26 14:15:19 2004//
+/mycalendar.php/1.3/Wed May 26 14:15:19 2004//
+/computers-add-select.php/1.6/Wed May 26 14:15:23 2004//
D
diff -udr cvs/CVS/Entries dev/CVS/Entries
--- cvs/CVS/Entries 2004-05-26 16:15:03.000000000 +0200
+++ dev/CVS/Entries 2004-05-26 16:15:27.000000000 +0200
@@ -24,9 +24,9 @@
/mycalendar.php/1.1/Thu May 6 16:15:01 2004//
/central.php/1.7/Thu May 6 16:15:23 2004//
/login.php/1.8/Thu May 6 16:15:23 2004//
-/CHANGELOG.txt/1.4/Wed May 26 14:14:47 2004//
-/Recup_computer_num.php/1.2/Wed May 26 14:14:47 2004//
-/find_num.php/1.7/Wed May 26 14:14:47 2004//
-/helpdesk.html/1.6/Wed May 26 14:14:47 2004//
-/index.php/1.4/Wed May 26 14:14:47 2004//
+/CHANGELOG.txt/1.4/Wed May 26 14:15:19 2004//
+/Recup_computer_num.php/1.2/Wed May 26 14:15:19 2004//
+/find_num.php/1.7/Wed May 26 14:15:19 2004//
+/helpdesk.html/1.6/Wed May 26 14:15:19 2004//
+/index.php/1.4/Wed May 26 14:15:19 2004//
D/stats////
diff -udr cvs/glpi/common/classes.php dev/glpi/common/classes.php
--- cvs/glpi/common/classes.php 2004-05-06 18:15:08.000000000 +0200
+++ dev/glpi/common/classes.php 2004-05-27 16:13:24.000000000 +0200
@@ -185,6 +185,34 @@
}
}
+ // return 1 if the connection to the LDAP host, auth mode, was successful
+ //
+ function connection_ldap($host,$basedn,$login,$pass)
+ {
+ error_reporting(16);
+ $dn = "uid=" . $login . "," . $basedn;
+ $rv = 0;
+
+ if ( $conn = ldap_connect($host) )
+ {
+ if ( ldap_bind($conn, $dn, $pass) ) {
+ $rv = 1;
+ }
+ else
+ {
+ $this->err = ldap_error();
+ }
+ ldap_close($conn);
+ }
+ else
+ {
+ $this->err = ldap_error();
+ }
+
+ return($rv);
+
+ } // connection_ldap()
+
// void;
//try to connect to DB
@@ -220,6 +248,106 @@
}
+ // Function that try to load from the db the user information.
+ //
+ function load_db_mysql($name)
+ {
+ $db = new DB;
+ $query = "SELECT * from users where (name = '".$name."')";
+ $result = $db->query($query);
+ //echo $query;
+ if($result)
+ {
+ if($db->numrows($result))
+ {
+ $this->user->getFromDB($name);
+ return 2;
+ }
+ else
+ {
+ $this->err = "Bad username";
+ return 1;
+ }
+ }
+ else
+ {
+ $err = "Erreur numero : ".$db->errno().": ";
+ $err += $db->error();
+ return 0;
+ }
+
+ }
+
+
+ // Function that try to load from LDAP the user information...
+ //
+ function
load_ldap($host,$basedn,$adm,$pass,$fields,$def_type,$def_caj,$name)
+ {
+ $db = new DB;
+ $query = "SELECT * from users where (name = '".$name."')";
+ $result = $db->query($query);
+ //echo $query;
+ if($result)
+ {
+ // not all the information can be stored on a LDAP
database, so
+ // at the first instance we load the data on the
database...
+ if($db->numrows($result))
+ {
+ $this->user->getFromDB($name);
+ }
+ else
+ {
+ $this->user->fields['password'] = "";
+ $this->user->fields['type'] = $def_type;
+ $this->user->fields['can_assign_job'] =
$def_caj;
+ }
+
+ if ( $conn = ldap_connect($host) )
+ {
+ if ( $adm != "" )
+ {
+ $dn = "uid=" . $adm . "," . $basedn;
+ $bv = ldap_bind($conn, $dn, $pass);
+ }
+ else
+ {
+ $bv = ldap_bind($conn);
+ }
+
+ if ( $bv )
+ {
+ $f = array_values($fields);
+ $sr = ldap_search($conn, $basedn, "uid=".$name,
$f);
+ $v = ldap_get_entries($conn, $sr);
+
+ foreach ($fields as $k => $e)
+ {
+ $this->user->fields[$k] =
$v[0][$e][0];
+ }
+ }
+ else
+ {
+ $this->err = ldap_error();
+ return 0;
+ }
+ ldap_close($conn);
+ }
+ else
+ {
+ $this->err = ldap_error();
+ return 0;
+ }
+ }
+ else
+ {
+ $err = "Erreur numero : ".$db->errno().": ";
+ $err += $db->error();
+ return 0;
+ }
+
+ } // load_ldap()
+
+
// Set Cookie for this user
function setCookies()
{
@@ -245,37 +373,25 @@
//Add an user to DB or update his password if user allready exist.
//The default type of the added user will be 'post-only'
- function add_an_user($name, $password, $host)
+ function add_an_user($name, $values)
{
+ $l = $this->load_db_mysql($name);
+ foreach ($values as $k => $e)
+ {
+ $this->user->fields[$k]=$e;
+ }
+
// Update user password if already known
- if ($this->connection_db_mysql($name,$password) == 2)
+ if ($l == 2)
{
- $update[0]="password";
- $this->user->fields["password"]=$password;
+ $update=array_keys($values);
$this->user->updateInDB($update);
-
}// Add user if not known
else
{
- // dump status
-
- $this->user->fields["name"]=$name;
- if(empty($host))
- {
- $this->user->fields["email"]=$name;
- }
- else
- {
- $this->user->fields["email"]=$name."@".$host;
- }
- $this->user->fields["type"]="post-only";
- $this->user->fields["realname"]=$name;
- $this->user->fields["can_assign_job"]="no";
+ $this->user->fields['name']=$name;
$this->user->addToDB();
- $update[0]="password";
- $this->user->fields["password"]=$password;
- $this->user->updateInDB($update);
}
}
diff -udr cvs/glpi/common/CVS/Entries dev/glpi/common/CVS/Entries
--- cvs/glpi/common/CVS/Entries 2004-05-26 16:14:47.000000000 +0200
+++ dev/glpi/common/CVS/Entries 2004-05-26 16:15:19.000000000 +0200
@@ -1,4 +1,4 @@
/_relpos.php/1.1/Thu May 6 16:15:02 2004//
/classes.php/1.7/Thu May 6 16:15:08 2004//
-/functions.php/1.21/Wed May 26 14:14:47 2004//
+/functions.php/1.21/Wed May 26 14:15:19 2004//
D
diff -udr cvs/glpi/computers/CVS/Entries dev/glpi/computers/CVS/Entries
--- cvs/glpi/computers/CVS/Entries 2004-05-26 16:14:47.000000000 +0200
+++ dev/glpi/computers/CVS/Entries 2004-05-26 16:15:19.000000000 +0200
@@ -1,4 +1,4 @@
/classes.php/1.3/Tue Oct 28 14:50:17 2003//
/_relpos.php/1.1/Thu May 6 16:15:02 2004//
-/functions.php/1.9/Wed May 26 14:14:47 2004//
+/functions.php/1.9/Wed May 26 14:15:19 2004//
D
diff -udr cvs/glpi/config/config.php dev/glpi/config/config.php
--- cvs/glpi/config/config.php 2004-05-26 16:14:48.000000000 +0200
+++ dev/glpi/config/config.php 2004-05-27 16:17:13.000000000 +0200
@@ -49,16 +49,16 @@
// Configuration standard changez selon vos besoins.
class DB extends DBmysql {
- var $dbhost = "localhost";
- var $dbuser = "root";
+ var $dbhost = "mysql";
+ var $dbuser = "gaio";
var $dbpassword = "";
- var $dbdefault = "glpidb";
+ var $dbdefault = "glpisv";
}
//root document
//document root
-$cfg_install["root"] = "/glpi-gna";
+$cfg_install["root"] = "/~gaio/glpi";
// *************************** Eléments optionnels **********************
@@ -93,7 +93,7 @@
//mettez cette option a 1 si vous vous voulez utiliser des sources
//d'informations externes/alternatives pour le login
//par defaut laissez cette valeur a 0;
-$cfg_login['use_extern'] = 0;
+$cfg_login['use_extern'] = 1;
// Gestion de source d'information alternatives pour le login
// telles que des serveurs de mail en imap pop...
@@ -105,8 +105,22 @@
// Si plusieurs sources alternatives sont définies, seule la première
// fournissant un login correct est utilisé
-$cfg_login['imap']['auth_server'] = "{localhost:993/imap/ssl/novalidate-cert}";
-$cfg_login['imap']['host'] = "sic.sp2mi.xxxx.fr";
+$cfg_login['imap']['auth_server'] = "{mail.sv.lnf.it:143}INBOX";
+$cfg_login['imap']['host'] = "sv.lnf.it";
+
+// LDAP setup.
+// We can use LDAP both for authentication and for user information
+$cfg_login['ldap']['host'] = "ldap.sv.lnf.it";
+$cfg_login['ldap']['basedn'] = "ou=People,dc=sv,dc=lnf,dc=it";
+// some lDAP server (eg, M$ Active Directory) does not like anonymous
+// bind
+//$cfg_login['ldap']['user'] = "cn=admin,ou=People,dc=sv,dc=lnf,dc=it";
+//$cfg_login['ldap']['pass'] = "secret";
+// relation between the GLPI users table field and the LDAP field
+$cfg_login['ldap']['fields'] = array( "name" => "uid", "email" => "mail",
"location" => "physicaldeliveryofficename", "phone" => "telephonenumber",
"realname" => "cn");
+$cfg_login['ldap']['def_type'] = "normal";
+$cfg_login['ldap']['def_caj'] = "no";
+
//other sources
//$cfg_login['other_source']...
@@ -215,7 +229,7 @@
// dicts
//dictionnaires
-$cfg_install["languages"] = array("english","deutsch","french");
+$cfg_install["languages"] = array("english","deutsch","french","italian");
// END OF CONFIGURATION
Only in dev/glpi/config: .#config.php.1.5
diff -udr cvs/glpi/config/CVS/Entries dev/glpi/config/CVS/Entries
--- cvs/glpi/config/CVS/Entries 2004-05-26 16:14:48.000000000 +0200
+++ dev/glpi/config/CVS/Entries 2004-05-26 16:15:19.000000000 +0200
@@ -1,5 +1,5 @@
/_relpos.php/1.1/Thu May 6 16:15:02 2004//
/config-ldap.php/1.1/Thu May 6 16:15:02 2004//
-/config.php/1.10/Wed May 26 14:14:48 2004//
-/styles.css/1.6/Wed May 26 14:14:48 2004//
+/config.php/1.10/Result of merge//
+/styles.css/1.6/Wed May 26 14:15:19 2004//
D
diff -udr cvs/glpi/dicts/CVS/Entries dev/glpi/dicts/CVS/Entries
--- cvs/glpi/dicts/CVS/Entries 2004-05-26 16:14:48.000000000 +0200
+++ dev/glpi/dicts/CVS/Entries 2004-05-26 16:15:19.000000000 +0200
@@ -1,4 +1,4 @@
/deutsch.php/1.2/Thu May 6 16:15:02 2004//
/english.php/1.3/Thu May 6 16:15:02 2004//
-/french.php/1.8/Wed May 26 14:14:48 2004//
+/french.php/1.8/Wed May 26 14:15:19 2004//
D
Only in dev/glpi/dicts: italian.php
diff -udr cvs/glpi/ldap/CVS/Entries dev/glpi/ldap/CVS/Entries
--- cvs/glpi/ldap/CVS/Entries 2004-05-26 16:14:48.000000000 +0200
+++ dev/glpi/ldap/CVS/Entries 2004-05-26 16:15:20.000000000 +0200
@@ -1,5 +1,5 @@
/Lisez-moi.txt/1.1/Sun Nov 16 22:09:48 2003//
/_relpos.php/1.1/Thu May 6 16:15:03 2004//
/classes.php/1.2/Thu May 6 16:15:03 2004//
-/functions.php/1.4/Wed May 26 14:14:48 2004//
+/functions.php/1.4/Wed May 26 14:15:20 2004//
D
diff -udr cvs/glpi/monitors/CVS/Entries dev/glpi/monitors/CVS/Entries
--- cvs/glpi/monitors/CVS/Entries 2004-05-26 16:14:53.000000000 +0200
+++ dev/glpi/monitors/CVS/Entries 2004-05-26 16:15:24.000000000 +0200
@@ -1,4 +1,4 @@
/classes.php/1.3/Tue Oct 28 14:50:17 2003//
/_relpos.php/1.1/Thu May 6 16:15:03 2004//
-/functions.php/1.9/Wed May 26 14:14:53 2004//
+/functions.php/1.9/Wed May 26 14:15:24 2004//
D
diff -udr cvs/glpi/networking/CVS/Entries dev/glpi/networking/CVS/Entries
--- cvs/glpi/networking/CVS/Entries 2004-05-26 16:14:48.000000000 +0200
+++ dev/glpi/networking/CVS/Entries 2004-05-26 16:15:20.000000000 +0200
@@ -1,4 +1,4 @@
/_relpos.php/1.1/Thu May 6 16:15:03 2004//
-/classes.php/1.7/Wed May 26 14:14:48 2004//
-/functions.php/1.13/Wed May 26 14:14:48 2004//
+/classes.php/1.7/Wed May 26 14:15:20 2004//
+/functions.php/1.13/Wed May 26 14:15:20 2004//
D
diff -udr cvs/glpi/printers/CVS/Entries dev/glpi/printers/CVS/Entries
--- cvs/glpi/printers/CVS/Entries 2004-05-26 16:14:53.000000000 +0200
+++ dev/glpi/printers/CVS/Entries 2004-05-26 16:15:24.000000000 +0200
@@ -1,4 +1,4 @@
/_relpos.php/1.1/Thu May 6 16:15:03 2004//
-/functions.php/1.11/Wed May 26 14:14:48 2004//
-/classes.php/1.4/Wed May 26 14:14:53 2004//
+/functions.php/1.11/Wed May 26 14:15:20 2004//
+/classes.php/1.4/Wed May 26 14:15:24 2004//
D
diff -udr cvs/glpi/setup/CVS/Entries dev/glpi/setup/CVS/Entries
--- cvs/glpi/setup/CVS/Entries 2004-05-26 16:14:48.000000000 +0200
+++ dev/glpi/setup/CVS/Entries 2004-05-26 16:15:20.000000000 +0200
@@ -1,4 +1,4 @@
/_relpos.php/1.1/Thu May 6 16:15:03 2004//
-/classes.php/1.5/Wed May 26 14:14:48 2004//
-/functions.php/1.9/Wed May 26 14:14:48 2004//
+/classes.php/1.5/Wed May 26 14:15:20 2004//
+/functions.php/1.9/Wed May 26 14:15:20 2004//
D
diff -udr cvs/glpi/software/CVS/Entries dev/glpi/software/CVS/Entries
--- cvs/glpi/software/CVS/Entries 2004-05-26 16:14:53.000000000 +0200
+++ dev/glpi/software/CVS/Entries 2004-05-26 16:15:24.000000000 +0200
@@ -1,4 +1,4 @@
/_relpos.php/1.1/Thu May 6 16:15:03 2004//
-/functions.php/1.10/Wed May 26 14:14:48 2004//
-/classes.php/1.4/Wed May 26 14:14:53 2004//
+/functions.php/1.10/Wed May 26 14:15:20 2004//
+/classes.php/1.4/Wed May 26 14:15:24 2004//
D
diff -udr cvs/glpi/tracking/CVS/Entries dev/glpi/tracking/CVS/Entries
--- cvs/glpi/tracking/CVS/Entries 2004-05-26 16:14:48.000000000 +0200
+++ dev/glpi/tracking/CVS/Entries 2004-05-26 16:15:20.000000000 +0200
@@ -1,4 +1,4 @@
/classes.php/1.3/Tue Oct 28 14:50:17 2003//
/_relpos.php/1.1/Thu May 6 16:15:03 2004//
-/functions.php/1.11/Wed May 26 14:14:48 2004//
+/functions.php/1.11/Wed May 26 14:15:20 2004//
D
diff -udr cvs/ldap/CVS/Entries dev/ldap/CVS/Entries
--- cvs/ldap/CVS/Entries 2004-05-26 16:14:53.000000000 +0200
+++ dev/ldap/CVS/Entries 2004-05-26 16:15:24.000000000 +0200
@@ -3,5 +3,5 @@
/ldap-del-entry.php/1.3/Tue Oct 28 14:50:18 2003//
/ldap-mod-attributes.php/1.3/Tue Oct 28 14:50:18 2003//
/_relpos.php/1.1/Thu May 6 16:15:03 2004//
-/index.php/1.4/Wed May 26 14:14:53 2004//
+/index.php/1.4/Wed May 26 14:15:24 2004//
D
diff -udr cvs/login.php dev/login.php
--- cvs/login.php 2004-05-06 18:15:23.000000000 +0200
+++ dev/login.php 2004-05-27 16:15:16.000000000 +0200
@@ -59,17 +59,21 @@
// if use external sources for login
if($cfg_login['use_extern'])
{
- //check for externals idents at remote imap/pop connection
-
+ // check for externals idents at remote imap/pop connection
$rem_host = $cfg_login['imap']['auth_server'];
-
if($identificat->connection_imap($rem_host,$_POST['name'],$_POST['password']))
+ if( !empty($rem_host) &&
$identificat->connection_imap($rem_host,$_POST['name'],$_POST['password']) )
{
$ext_ident = 1;
$host = $cfg_login[imap]['host'];
-
}
-
+ // check for externals idents at remote ldap server(s)
+ $rem_host = $cfg_login['ldap']['host'];
+ $rem_basedn = $cfg_login['ldap']['basedn'];
+ if( ($ext_ident == 0) && !empty($rem_host) &&
$identificat->connection_ldap($rem_host,$rem_basedn,$_POST['name'],$_POST['password'])
)
+ {
+ $ext_ident = 1;
+ }
//to add another ext ident sources...
//put it on the glpi/glpi/config/config.php
@@ -89,8 +93,6 @@
//}
//}
-
-
}
$conn = $identificat->connection_db_mysql($_POST['name'],$_POST['password']);
@@ -105,7 +107,6 @@
//if no external ident or all external ident failled
if(!($ext_ident))
{
-
nullHeader("Login",$_SERVER["PHP_SELF"]);
echo
"<center><b>".$identificat->getErr().".</b><br><br>";
echo "<b><a
href=\"".$cfg_install["root"]."/logout.php\">Relogin</a></b></center>";
@@ -117,16 +118,25 @@
else
{
//if an external ident has been successfull: add the user to
the DB or update
- //his password if allready exist
- $identificat->add_an_user($_POST['name'],
$_POST['password'], $host);
- $conn =
$identificat->connection_db_mysql($_POST['name'],$_POST['password']);
+ //his password if already exist
+ $identificat->user->fields['name']=$_POST['name'];
+ $identificat->user->fields['email']=$_POST['name'] . "@" .
$host;
+ $identificat->user->fields['type']='post-only';
+ $identificat->user->fields['realname']=$_POST['name'];
+ $identificat->user->fields['can_assign_job']='no';
+ $identificat->load_ldap($cfg_login['ldap']['host'],
+ $cfg_login['ldap']['basedn'],
+ '','',$cfg_login['ldap']['fields'],
+ $cfg_login['ldap']['def_type'],
+ $cfg_login['ldap']['def_caj'],$name);
+ $identificat->add_an_user($_POST['name'],
$identificat->user->fields);
$login_ok = 1;
break;
}
}
case 2:
{//good login
-
++
$login_ok = 1;
break;
diff -udr cvs/monitors/CVS/Entries dev/monitors/CVS/Entries
--- cvs/monitors/CVS/Entries 2004-05-26 16:14:49.000000000 +0200
+++ dev/monitors/CVS/Entries 2004-05-26 16:15:20.000000000 +0200
@@ -2,6 +2,6 @@
/_relpos.php/1.1/Thu May 6 16:15:03 2004//
/monitors-search.php/1.6/Thu May 6 16:15:03 2004//
/monitors-info-form.php/1.8/Thu May 6 16:15:08 2004//
-/index.php/1.5/Wed May 26 14:14:49 2004//
-/mycalendar.php/1.2/Wed May 26 14:14:49 2004//
+/index.php/1.5/Wed May 26 14:15:20 2004//
+/mycalendar.php/1.2/Wed May 26 14:15:20 2004//
D
diff -udr cvs/mysql/CVS/Entries dev/mysql/CVS/Entries
--- cvs/mysql/CVS/Entries 2004-05-26 16:14:49.000000000 +0200
+++ dev/mysql/CVS/Entries 2004-05-26 16:15:20.000000000 +0200
@@ -3,5 +3,5 @@
/glpi-0.21-TO-0.22/1.2/Sun May 2 21:27:10 2004//
/glpi-0.22-default.sql/1.1/Sun Feb 15 17:05:26 2004//
/glpi-0.23-default.sql/1.1/Sun May 2 21:25:31 2004//
-/0.2-to-0.23.sql/1.2/Wed May 26 14:14:49 2004//
+/0.2-to-0.23.sql/1.2/Wed May 26 14:15:20 2004//
D
diff -udr cvs/networking/CVS/Entries dev/networking/CVS/Entries
--- cvs/networking/CVS/Entries 2004-05-26 16:14:49.000000000 +0200
+++ dev/networking/CVS/Entries 2004-05-26 16:15:21.000000000 +0200
@@ -4,6 +4,6 @@
/networking-info-form.php/1.7/Thu May 6 16:15:08 2004//
/networking-port-connect.php/1.7/Thu May 6 16:15:08 2004//
/networking-port.php/1.7/Thu May 6 16:15:08 2004//
-/index.php/1.5/Wed May 26 14:14:49 2004//
-/mycalendar.php/1.2/Wed May 26 14:14:49 2004//
+/index.php/1.5/Wed May 26 14:15:20 2004//
+/mycalendar.php/1.2/Wed May 26 14:15:21 2004//
D
diff -udr cvs/pics/CVS/Entries dev/pics/CVS/Entries
--- cvs/pics/CVS/Entries 2004-05-26 16:14:49.000000000 +0200
+++ dev/pics/CVS/Entries 2004-05-26 16:15:21.000000000 +0200
@@ -6,7 +6,7 @@
/logo-glpi.png/1.1/Thu May 6 16:15:04 2004/-kb/
/warning.png/1.2/Thu May 6 16:15:04 2004/-kb/
/ajoutinterv.png/1.1/Sat May 22 23:09:32 2004/-kb/
-/inventaire.png/1.2/Wed May 26 14:14:49 2004/-kb/
-/maintenance.png/1.2/Wed May 26 14:14:49 2004/-kb/
+/inventaire.png/1.2/Wed May 26 14:15:21 2004/-kb/
+/maintenance.png/1.2/Wed May 26 14:15:21 2004/-kb/
/suivi.png/1.1/Sat May 22 23:09:32 2004/-kb/
D
diff -udr cvs/printers/CVS/Entries dev/printers/CVS/Entries
--- cvs/printers/CVS/Entries 2004-05-26 16:14:49.000000000 +0200
+++ dev/printers/CVS/Entries 2004-05-26 16:15:21.000000000 +0200
@@ -2,6 +2,6 @@
/_relpos.php/1.1/Thu May 6 16:15:04 2004//
/printers-search.php/1.9/Thu May 6 16:15:04 2004//
/printers-info-form.php/1.9/Thu May 6 16:15:08 2004//
-/index.php/1.5/Wed May 26 14:14:49 2004//
-/mycalendar.php/1.2/Wed May 26 14:14:49 2004//
+/index.php/1.5/Wed May 26 14:15:21 2004//
+/mycalendar.php/1.2/Wed May 26 14:15:21 2004//
D
diff -udr cvs/reports/CVS/Entries dev/reports/CVS/Entries
--- cvs/reports/CVS/Entries 2004-05-26 16:14:49.000000000 +0200
+++ dev/reports/CVS/Entries 2004-05-26 16:15:21.000000000 +0200
@@ -1,3 +1,3 @@
D/reports////
/_relpos.php/1.1/Thu May 6 16:15:04 2004//
-/index.php/1.6/Wed May 26 14:14:49 2004//
+/index.php/1.6/Wed May 26 14:15:21 2004//
diff -udr cvs/reports/reports/CVS/Entries dev/reports/reports/CVS/Entries
--- cvs/reports/reports/CVS/Entries 2004-05-26 16:15:03.000000000 +0200
+++ dev/reports/reports/CVS/Entries 2004-05-26 16:15:28.000000000 +0200
@@ -1,8 +1,8 @@
/maintenance-list.php/1.4/Tue Oct 28 14:50:18 2003//
/parAnnee-list.php/1.4/Tue Oct 28 14:50:19 2003//
/_relpos.php/1.1/Thu May 6 16:15:04 2004//
-/default.php/1.2/Wed May 26 14:14:49 2004//
-/geneExcel.php/1.2/Wed May 26 14:14:49 2004//
-/maintenance.php/1.6/Wed May 26 14:14:49 2004//
+/default.php/1.2/Wed May 26 14:15:21 2004//
+/geneExcel.php/1.2/Wed May 26 14:15:21 2004//
+/maintenance.php/1.6/Wed May 26 14:15:21 2004//
D/convexcel////
-/parAnnee.php/1.5/Wed May 26 14:14:53 2004//
+/parAnnee.php/1.5/Wed May 26 14:15:24 2004//
diff -udr cvs/setup/CVS/Entries dev/setup/CVS/Entries
--- cvs/setup/CVS/Entries 2004-05-26 16:14:53.000000000 +0200
+++ dev/setup/CVS/Entries 2004-05-26 16:15:24.000000000 +0200
@@ -4,7 +4,7 @@
/_relpos.php/1.1/Thu May 6 16:15:06 2004//
/setup-assign-job.php/1.5/Thu May 6 16:15:08 2004//
/setup-dropdowns.php/1.5/Thu May 6 16:15:08 2004//
-/mycalendar.php/1.3/Wed May 26 14:14:51 2004//
-/setup-templates.php/1.8/Wed May 26 14:14:51 2004//
-/index.php/1.6/Wed May 26 14:14:53 2004//
+/mycalendar.php/1.3/Wed May 26 14:15:22 2004//
+/setup-templates.php/1.8/Wed May 26 14:15:22 2004//
+/index.php/1.6/Wed May 26 14:15:24 2004//
D
diff -udr cvs/software/CVS/Entries dev/software/CVS/Entries
--- cvs/software/CVS/Entries 2004-05-26 16:14:53.000000000 +0200
+++ dev/software/CVS/Entries 2004-05-26 16:15:24.000000000 +0200
@@ -2,5 +2,5 @@
/software-search.php/1.6/Thu May 6 16:15:06 2004//
/software-info-form.php/1.8/Thu May 6 16:15:09 2004//
/software-licenses.php/1.9/Thu May 6 16:15:09 2004//
-/index.php/1.4/Wed May 26 14:14:53 2004//
+/index.php/1.4/Wed May 26 14:15:24 2004//
D
diff -udr cvs/tracking/CVS/Entries dev/tracking/CVS/Entries
--- cvs/tracking/CVS/Entries 2004-05-26 16:14:53.000000000 +0200
+++ dev/tracking/CVS/Entries 2004-05-26 16:15:24.000000000 +0200
@@ -4,5 +4,5 @@
/tracking-assign-form.php/1.7/Thu May 6 16:15:09 2004//
/tracking-followups.php/1.6/Thu May 6 16:15:09 2004//
/tracking-injector.php/1.7/Thu May 6 16:15:09 2004//
-/tracking-mark.php/1.4/Wed May 26 14:14:53 2004//
+/tracking-mark.php/1.4/Wed May 26 14:15:24 2004//
D
