extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-25 23:39:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove stray whitespace, add descr for sha password encrypt function

Browse Source
This commit is contained in:
Miles Lott 2002-05-26 19:57:35 +00:00
parent d2f00f43ce
commit 96432a8a97
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
phpgwapi/inc/class.common.inc.php
View File

@ -995,7 +995,7 @@
$GLOBALS['phpgw']->template->set_block('common','msgbox_row'); $GLOBALS['phpgw']->template->set_block('common','msgbox_row');
$GLOBALS['phpgw']->template->set_block('common','msgbox_end'); $GLOBALS['phpgw']->template->set_block('common','msgbox_end');
$GLOBALS['phpgw']->template->fp('msgbox','msgbox_start'); $GLOBALS['phpgw']->template->fp('msgbox','msgbox_start');
if (is_array($text)) if (is_array($text))
{ {
reset($text); reset($text);
@ -1055,7 +1055,7 @@
return $GLOBALS['phpgw']->template->varvals['msgbox']; return $GLOBALS['phpgw']->template->varvals['msgbox'];
} }
} }
/*! /*!
@function navbar @function navbar
@abstract Build the application navigation bar based on user's accessible applications @abstract Build the application navigation bar based on user's accessible applications
@ -1178,7 +1178,7 @@
if(!function_exists('parse_navbar')) if(!function_exists('parse_navbar'))
{ {
$this->navbar(False); $this->navbar(False);
include(PHPGW_INCLUDE_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] . '/navbar.inc.php'); include(PHPGW_INCLUDE_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] . '/navbar.inc.php');
} }
if (!@$GLOBALS['phpgw_info']['flags']['nonavbar'] && !@$GLOBALS['phpgw_info']['flags']['navbar_target']) if (!@$GLOBALS['phpgw_info']['flags']['nonavbar'] && !@$GLOBALS['phpgw_info']['flags']['navbar_target'])
{ {
@ -1248,7 +1248,7 @@
$GLOBALS['phpgw']->db->disconnect(); $GLOBALS['phpgw']->db->disconnect();
parse_navbar_end(); parse_navbar_end();
} }
/* Clean up mcrypt */ /* Clean up mcrypt */
if (@is_object($GLOBALS['phpgw']->crypto)) if (@is_object($GLOBALS['phpgw']->crypto))
{ {
@ -1293,7 +1293,7 @@
$lcrypt = '{crypt}'; $lcrypt = '{crypt}';
$password = crypt($userpass); $password = crypt($userpass);
$ldappassword = sprintf('%s%s', $lcrypt, $password); $ldappassword = sprintf('%s%s', $lcrypt, $password);
return $ldappassword; return $ldappassword;
} }
/*! /*!
@ -1301,7 +1301,7 @@
@abstract md5 encrypt password @abstract md5 encrypt password
@param $userpass user password @param $userpass user password
@param $random random seed @param $random random seed
*/ */
function md5_cryptpasswd($userpass, $random) function md5_cryptpasswd($userpass, $random)
{ {
$bsalt = '$1$'; $bsalt = '$1$';
@ -1313,7 +1313,11 @@
return $ldappassword; return $ldappassword;
} }
/*!
@function sha_cryptpasswd
@abstract sha encrypt password
@param $userpass user password
*/
function sha_cryptpasswd($userpass) function sha_cryptpasswd($userpass)
{ {
$hash = base64_encode(mhash(MHASH_SHA1, $userpass)); $hash = base64_encode(mhash(MHASH_SHA1, $userpass));