cvs: pear /File_Passwd package.xml /File_Passwd/Passwd Authbasic.php Authdigest.php Cvs.php Smb.php Unix.php

mike Fri Nov 5 03:46:59 2004 EDT Modified files: /pear/File_Passwd/Passwd Authbasic.php Authdigest.php Cvs.php Smb.php Unix.php /pear/File_Passwd package.xml Log: * renamed generatePassword() to generatePasswd() for consitency

http://cvs.php.net/diff.php/pear/File_Passwd/Passwd/Authbasic.php?r1=1.15&r2=1.16&ty=u Index: pear/File_Passwd/Passwd/Authbasic.php diff -u pear/File_Passwd/Passwd/Authbasic.php:1.15 pear/File_Passwd/Passwd/Authbasic.php:1.16 --- pear/File_Passwd/Passwd/Authbasic.php:1.15 Mon Jun 7 15:19:47 2004 +++ pear/File_Passwd/Passwd/Authbasic.php Fri Nov 5 03:46:59 2004 @@ -11,7 +11,7 @@ // | Copyright (c) 2003-2004 Michael Wallner <mike@iworks.at> | // +----------------------------------------------------------------------+ // -// $Id: Authbasic.php,v 1.15 2004/06/07 19:19:47 mike Exp $ +// $Id: Authbasic.php,v 1.16 2004/11/05 08:46:59 mike Exp $ /** * Manipulate AuthUserFiles as used for HTTP Basic Authentication. @@ -51,7 +51,7 @@ * * @author Michael Wallner <mike@php.net> * @package File_Passwd -* @version $Revision: 1.15 $ +* @version $Revision: 1.16 $ * @access public */ class File_Passwd_Authbasic extends File_Passwd_Common @@ -372,7 +372,7 @@ * @param string $mode The encryption mode to use (des|md5|sha). * @param string $salt The salt to use. */ - function generatePassword($pass, $mode = FILE_PASSWD_DES, $salt = null) + function generatePasswd($pass, $mode = FILE_PASSWD_DES, $salt = null) { if (!in_array(strToLower($mode), array('des', 'md5', 'sha'))) { return PEAR::raiseError( @@ -383,5 +383,13 @@ return File_Passwd_Authbasic::_genPass($pass, $salt, $mode); } + /** + * @ignore + * @deprecated + */ + function generatePassword($pass, $mode = FILE_PASSWD_DES, $salt = null) + { + return File_Passwd_Authbasic::generatePasswd($pass, $mode, $salt); + } } ?> \ No newline at end of file http://cvs.php.net/diff.php/pear/File_Passwd/Passwd/Authdigest.php?r1=1.10&r2=1.11&ty=u Index: pear/File_Passwd/Passwd/Authdigest.php diff -u pear/File_Passwd/Passwd/Authdigest.php:1.10 pear/File_Passwd/Passwd/Authdigest.php:1.11 --- pear/File_Passwd/Passwd/Authdigest.php:1.10 Mon Jun 7 15:19:47 2004 +++ pear/File_Passwd/Passwd/Authdigest.php Fri Nov 5 03:46:59 2004 @@ -11,7 +11,7 @@ // | Copyright (c) 2003-2004 Michael Wallner <mike@iworks.at> | // +----------------------------------------------------------------------+ // -// $Id: Authdigest.php,v 1.10 2004/06/07 19:19:47 mike Exp $ +// $Id: Authdigest.php,v 1.11 2004/11/05 08:46:59 mike Exp $ /** * Manipulate AuthDigestFiles as used for HTTP Digest Authentication. @@ -53,7 +53,7 @@ * * @author Michael Wallner <mike@php.net> * @package File_Passwd -* @version $Revision: 1.10 $ +* @version $Revision: 1.11 $ * @access public */ class File_Passwd_Authdigest extends File_Passwd_Common @@ -344,10 +344,18 @@ * @param string $realm The realm the user is in. * @param string $pass The plaintext password. */ - function generatePassword($user, $realm, $pass) + function generatePasswd($user, $realm, $pass) { return md5("$user:$realm:$pass"); } + /** + * @ignore + * @deprecated + */ + function generatePassword($user, $realm, $pass) + { + return File_Passwd_Authdigest::generatePasswd($user, $realm, $pass); + } } ?> \ No newline at end of file http://cvs.php.net/diff.php/pear/File_Passwd/Passwd/Cvs.php?r1=1.12&r2=1.13&ty=u Index: pear/File_Passwd/Passwd/Cvs.php diff -u pear/File_Passwd/Passwd/Cvs.php:1.12 pear/File_Passwd/Passwd/Cvs.php:1.13 --- pear/File_Passwd/Passwd/Cvs.php:1.12 Mon Jun 7 15:19:47 2004 +++ pear/File_Passwd/Passwd/Cvs.php Fri Nov 5 03:46:59 2004 @@ -11,7 +11,7 @@ // | Copyright (c) 2003-2004 Michael Wallner <mike@iworks.at> | // +----------------------------------------------------------------------+ // -// $Id: Cvs.php,v 1.12 2004/06/07 19:19:47 mike Exp $ +// $Id: Cvs.php,v 1.13 2004/11/05 08:46:59 mike Exp $ /** * Manipulate CVS pserver passwd files. @@ -54,7 +54,7 @@ * * @author Michael Wallner <mike@php.net> * @package File_Passwd -* @version $Revision: 1.12 $ +* @version $Revision: 1.13 $ * @access public */ class File_Passwd_Cvs extends File_Passwd_Common @@ -286,10 +286,18 @@ * @param string $pass new plaintext password * @param string $salt new crypted password from which to gain the salt */ - function generatePassword($pass, $salt = null) + function generatePasswd($pass, $salt = null) { return File_Passwd::crypt_des($pass, $salt); } + /** + * @ignore + * @deprecated + */ + function generatePassword($pass, $salt = null) + { + return File_Passwd_Cvs::generatePasswd($pass, $salt); + } } ?> \ No newline at end of file http://cvs.php.net/diff.php/pear/File_Passwd/Passwd/Smb.php?r1=1.15&r2=1.16&ty=u Index: pear/File_Passwd/Passwd/Smb.php diff -u pear/File_Passwd/Passwd/Smb.php:1.15 pear/File_Passwd/Passwd/Smb.php:1.16 --- pear/File_Passwd/Passwd/Smb.php:1.15 Mon Jun 7 15:19:47 2004 +++ pear/File_Passwd/Passwd/Smb.php Fri Nov 5 03:46:59 2004 @@ -11,7 +11,7 @@ // | Copyright (c) 2003-2004 Michael Wallner <mike@iworks.at> | // +----------------------------------------------------------------------+ // -// $Id: Smb.php,v 1.15 2004/06/07 19:19:47 mike Exp $ +// $Id: Smb.php,v 1.16 2004/11/05 08:46:59 mike Exp $ /** * Manipulate SMB server passwd files. @@ -72,7 +72,7 @@ * @author Michael Bretterklieber <michael@bretterklieber.com> * @author Michael Wallner <mike@php.net> * @package File_Passwd -* @version $Revision: 1.15 $ +* @version $Revision: 1.16 $ * @access public */ class File_Passwd_Smb extends File_Passwd_Common @@ -404,7 +404,7 @@ * @param string $pass The plaintext password. * @param string $mode The encryption mode to use (nt|lm). */ - function generatePassword($pass, $mode = 'nt') + function generatePasswd($pass, $mode = 'nt') { $chap = &new Crypt_CHAP_MSv1; $hash = strToLower($mode) == 'nt' ? @@ -413,5 +413,13 @@ return strToUpper(bin2hex($hash)); } + /** + * @ignore + * @deprecated + */ + function generatePassword($pass, $mode = 'nt') + { + return File_Passwd_Smb::generatePasswd($pass, $mode); + } } ?> http://cvs.php.net/diff.php/pear/File_Passwd/Passwd/Unix.php?r1=1.15&r2=1.16&ty=u Index: pear/File_Passwd/Passwd/Unix.php diff -u pear/File_Passwd/Passwd/Unix.php:1.15 pear/File_Passwd/Passwd/Unix.php:1.16 --- pear/File_Passwd/Passwd/Unix.php:1.15 Mon Jun 7 15:19:47 2004 +++ pear/File_Passwd/Passwd/Unix.php Fri Nov 5 03:46:59 2004 @@ -11,7 +11,7 @@ // | Copyright (c) 2003-2004 Michael Wallner <mike@iworks.at> | // +----------------------------------------------------------------------+ // -// $Id: Unix.php,v 1.15 2004/06/07 19:19:47 mike Exp $ +// $Id: Unix.php,v 1.16 2004/11/05 08:46:59 mike Exp $ /** * Manipulate standard Unix passwd files. @@ -61,7 +61,7 @@ * * @author Michael Wallner <mike@php.net> * @package File_Passwd -* @version $Revision: 1.15 $ +* @version $Revision: 1.16 $ * @access public */ class File_Passwd_Unix extends File_Passwd_Common @@ -635,7 +635,7 @@ * @param string $mode The encryption mode to use. * @param string $salt The salt to use. */ - function generatePassword($pass, $mode = 'md5', $salt = null) + function generatePasswd($pass, $mode = FILE_PASSWD_MD5, $salt = null) { if (!isset($mode)) { return PEAR::raiseError( @@ -646,5 +646,14 @@ return File_Passwd_Unix::_genPass($pass, $salt, $mode); } + /** + * @ignore + * @deprecated + */ + function generatePassword($pass, $mode = FILE_PASSWD_MD5, $salt = null) + { + return File_Passwd_Unix::generatePasswd($pass, $mode, $salt); + } + } ?> \ No newline at end of file http://cvs.php.net/diff.php/pear/File_Passwd/package.xml?r1=1.34&r2=1.35&ty=u Index: pear/File_Passwd/package.xml diff -u pear/File_Passwd/package.xml:1.34 pear/File_Passwd/package.xml:1.35 --- pear/File_Passwd/package.xml:1.34 Mon Jun 7 15:25:43 2004 +++ pear/File_Passwd/package.xml Fri Nov 5 03:46:59 2004 @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> -<!-- $Revision: 1.34 $ --> +<!-- $Revision: 1.35 $ --> <package version="1.0"> <name>File_Passwd</name> <license>PHP</license> <summary>Manipulate many kinds of password files</summary> <description> -Provides methods to manipulate standard Unix, SMB server, AuthUser (.htpasswd), AuthDigest (.htdigest), CVS pserver and custom formatted password files. +Provides methods to manipulate and authenticate against standard Unix, +SMB server, AuthUser (.htpasswd), AuthDigest (.htdigest), CVS pserver +and custom formatted password files. </description> <maintainers> <maintainer> @@ -16,12 +18,13 @@ </maintainer> </maintainers> <release> - <version>1.1.0</version> - <date>2004-06-07</date> + <version>1.1.1</version> + <date>2004-10-05</date> <state>stable</state> - <notes> -+ Added public static generatePassword() methods to all File_Passwd_* classes except File_Passwd_Custom. - </notes> + <notes><![CDATA[ +Renamed File_Passwd_*::generatePassword() to generatePasswd() to be consistent; +introduced generatePassword() methods are still available for BC reasons. +]]> </notes> <filelist> <dir name="/" baseinstalldir="File"> <file role="php">Passwd.php</file>