extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 17:14:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

SF #413717 - Fixed undefined function update_lastlogin(), this problem was for more then just mail_auth

Browse Source
This commit is contained in:
jengo 2001-04-10 07:58:19 +00:00
parent a6081e5184
commit 50c4666ecc
3 changed files with 85 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phpgwapi/inc/class.auth_http.inc.php
View File

@ -41,5 +41,17 @@
global $phpgw_info, $phpgw; global $phpgw_info, $phpgw;
return False; return False;
} }
// Since there account data will still be stored in SQL, this should be safe to do. (jengo)
function update_lastlogin($account_id, $ip)
{
global $phpgw;
$account_id = get_account_id($account_id);
$phpgw->db->query("update phpgw_accounts set account_lastloginfrom='"
. "$ip', account_lastlogin='" . time()
. "' where account_id='$account_id'",__LINE__,__FILE__);
}
} }
?> ?>

118
phpgwapi/inc/class.auth_ldap.inc.php
View File

@ -1,32 +1,33 @@
<?php <?php
/**************************************************************************\ /**************************************************************************\
* phpGroupWare API - Auth from LDAP * * phpGroupWare API - Auth from LDAP *
* This file written by Lars Kneschke <kneschke@phpgroupware.org> * * This file written by Lars Kneschke <kneschke@phpgroupware.org> *
* and Joseph Engo <jengo@phpgroupware.org> * * and Joseph Engo <jengo@phpgroupware.org> *
* Authentication based on LDAP Server * * Authentication based on LDAP Server *
* Copyright (C) 2000, 2001 Joseph Engo * * Copyright (C) 2000, 2001 Joseph Engo *
* -------------------------------------------------------------------------* * -------------------------------------------------------------------------*
* This library is part of the phpGroupWare API * * This library is part of the phpGroupWare API *
* http://www.phpgroupware.org/api * * http://www.phpgroupware.org/api *
* ------------------------------------------------------------------------ * * ------------------------------------------------------------------------ *
* This library is free software; you can redistribute it and/or modify it * * This library is free software; you can redistribute it and/or modify it *
* under the terms of the GNU Lesser General Public License as published by * * under the terms of the GNU Lesser General Public License as published by *
* the Free Software Foundation; either version 2.1 of the License, * * the Free Software Foundation; either version 2.1 of the License, *
* or any later version. * * or any later version. *
* This library is distributed in the hope that it will be useful, but * * This library is distributed in the hope that it will be useful, but *
* WITHOUT ANY WARRANTY; without even the implied warranty of * * WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
* See the GNU Lesser General Public License for more details. * * See the GNU Lesser General Public License for more details. *
* You should have received a copy of the GNU Lesser General Public License * * You should have received a copy of the GNU Lesser General Public License *
* along with this library; if not, write to the Free Software Foundation, * * along with this library; if not, write to the Free Software Foundation, *
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
\**************************************************************************/ \**************************************************************************/
/* $Id$ */ /* $Id$ */
class auth class auth
{ {
function authenticate($username, $passwd) { function authenticate($username, $passwd)
{
global $phpgw_info, $phpgw; global $phpgw_info, $phpgw;
// error_reporting MUST be set to zero, otherwise you'll get nasty LDAP errors with a bad login/pass... // error_reporting MUST be set to zero, otherwise you'll get nasty LDAP errors with a bad login/pass...
// these are just "warnings" and can be ignored..... // these are just "warnings" and can be ignored.....
@ -37,7 +38,7 @@
// find the dn for this uid, the uid is not always in the dn // find the dn for this uid, the uid is not always in the dn
$sri = ldap_search($ldap, $phpgw_info['server']['ldap_context'], 'uid='.$username); $sri = ldap_search($ldap, $phpgw_info['server']['ldap_context'], 'uid='.$username);
$allValues = ldap_get_entries($ldap, $sri); $allValues = ldap_get_entries($ldap, $sri);
if($allValues['count'] > 0) if ($allValues['count'] > 0)
{ {
// we only care about the first dn // we only care about the first dn
$userDN = $allValues[0]['dn']; $userDN = $allValues[0]['dn'];
@ -54,43 +55,44 @@
// dn not found or password wrong // dn not found or password wrong
return False; return False;
}
function change_password($old_passwd, $new_passwd, $_account_id="")
{
global $phpgw_info, $phpgw;
if ("" == $_account_id)
{
$_account_id = $phpgw_info['user']['account_id'];
} }
$ds = $phpgw->common->ldapConnect(); function change_password($old_passwd, $new_passwd, $_account_id="")
$sri = ldap_search($ds, $phpgw_info["server"]["ldap_context"], "uidnumber=$_account_id");
$allValues = ldap_get_entries($ds, $sri);
$entry['userpassword'] = $phpgw->common->encrypt_password($new_passwd);
$dn = $allValues[0]["dn"];
if (!@ldap_modify($ds, $dn, $entry))
{ {
return false; global $phpgw_info, $phpgw;
if ("" == $_account_id)
{
$_account_id = $phpgw_info['user']['account_id'];
}
$ds = $phpgw->common->ldapConnect();
$sri = ldap_search($ds, $phpgw_info["server"]["ldap_context"], "uidnumber=$_account_id");
$allValues = ldap_get_entries($ds, $sri);
$entry['userpassword'] = $phpgw->common->encrypt_password($new_passwd);
$dn = $allValues[0]["dn"];
if (!@ldap_modify($ds, $dn, $entry))
{
return false;
}
return $encrypted_passwd;
} }
return $encrypted_passwd; // This data needs to be updated in LDAP, not SQL (jengo)
function update_lastlogin($account_id, $ip)
{
global $phpgw;
$account_id = get_account_id($account_id);
$now = time();
$phpgw->db->query("update phpgw_accounts set account_lastloginfrom='"
. "$ip', account_lastlogin='" . $now
. "' where account_id='$account_id'",__LINE__,__FILE__);
}
} }
function update_lastlogin($account_id, $ip)
{
global $phpgw;
$account_id = get_account_id($account_id);
$now = time();
$phpgw->db->query("update phpgw_accounts set account_lastloginfrom='"
. "$ip', account_lastlogin='" . $now
. "' where account_id='$account_id'",__LINE__,__FILE__);
}
}
?> ?>

13
phpgwapi/inc/class.auth_mail.inc.php
View File

@ -67,5 +67,18 @@
global $phpgw_info, $phpgw; global $phpgw_info, $phpgw;
return False; return False;
} }
// Since there account data will still be stored in SQL, this should be safe to do. (jengo)
function update_lastlogin($account_id, $ip)
{
global $phpgw;
$account_id = get_account_id($account_id);
$phpgw->db->query("update phpgw_accounts set account_lastloginfrom='"
. "$ip', account_lastlogin='" . time()
. "' where account_id='$account_id'",__LINE__,__FILE__);
}
} }
?> ?>