onokazu
onoka****@users*****
2006年 4月 8日 (土) 14:10:38 JST
Index: xoops2jp/html/kernel/member.php
diff -u xoops2jp/html/kernel/member.php:1.4.6.1 xoops2jp/html/kernel/member.php:1.4.6.2
--- xoops2jp/html/kernel/member.php:1.4.6.1 Sun Feb 5 14:19:52 2006
+++ xoops2jp/html/kernel/member.php Sat Apr 8 14:10:37 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: member.php,v 1.4.6.1 2006/02/05 05:19:52 onokazu Exp $
+// $Id: member.php,v 1.4.6.2 2006/04/08 05:10:37 onokazu Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -322,26 +322,20 @@
*
* @param string $uname username as entered in the login form
* @param string $pwd password entered in the login form
- * @return object XoopsUser reference to the logged in user. FALSE if failed to log in
+ * @return mixed XoopsUser reference to the logged in user. FALSE if failed to log in
*/
function &loginUser($uname, $pwd)
{
- $criteria = new CriteriaCompo(new Criteria('uname', $uname));
- $criteria->add(new Criteria('pass', md5($pwd)));
- $user =& $this->_uHandler->getObjects($criteria, false);
- if (!$user || count($user) != 1) {
- $ret = false;
- return $ret;
- }
- return $user[0];
+ $user =& $this->loginUserMd5($uname, md5($pwd));
+ return $user;
}
/**
- * logs in a user with an nd5 encrypted password
+ * logs in a user with an md5 encrypted password
*
* @param string $uname username
* @param string $md5pwd password encrypted with md5
- * @return object XoopsUser reference to the logged in user. FALSE if failed to log in
+ * @return mixed XoopsUser reference to the logged in user. FALSE if failed to log in
*/
function &loginUserMd5($uname, $md5pwd)
{