[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.140,1.141

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv30137

Modified Files:
        class.common.inc.php 
Log Message:
remove stray whitespace, add descr for sha password encrypt function

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -r1.140 -r1.141
*** class.common.inc.php        26 May 2002 08:23:49 -0000      1.140
--- class.common.inc.php        26 May 2002 19:57:35 -0000      1.141
***************
*** 996,1000 ****
                        
$GLOBALS['phpgw']->template->set_block('common','msgbox_end');
                        
$GLOBALS['phpgw']->template->fp('msgbox','msgbox_start');
!                       
                        if (is_array($text))
                        {
--- 996,1000 ----
                        
$GLOBALS['phpgw']->template->set_block('common','msgbox_end');
                        
$GLOBALS['phpgw']->template->fp('msgbox','msgbox_start');
! 
                        if (is_array($text))
                        {
***************
*** 1056,1060 ****
                        }
                }
!               
                /*!
                @function navbar
--- 1056,1060 ----
                        }
                }
! 
                /*!
                @function navbar
***************
*** 1179,1183 ****
                        {
                                $this->navbar(False);
!                               include(PHPGW_INCLUDE_ROOT . 
'/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set']  . 
'/navbar.inc.php');
                        }
                        if (address@hidden'phpgw_info']['flags']['nonavbar'] && 
address@hidden'phpgw_info']['flags']['navbar_target'])
--- 1179,1183 ----
                        {
                                $this->navbar(False);
!                               include(PHPGW_INCLUDE_ROOT . 
'/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] . 
'/navbar.inc.php');
                        }
                        if (address@hidden'phpgw_info']['flags']['nonavbar'] && 
address@hidden'phpgw_info']['flags']['navbar_target'])
***************
*** 1249,1253 ****
                                parse_navbar_end();
                        }
!                       
                        /* Clean up mcrypt */
                        if (@is_object($GLOBALS['phpgw']->crypto))
--- 1249,1253 ----
                                parse_navbar_end();
                        }
! 
                        /* Clean up mcrypt */
                        if (@is_object($GLOBALS['phpgw']->crypto))
***************
*** 1294,1298 ****
                        $password = crypt($userpass);
                        $ldappassword = sprintf('%s%s', $lcrypt, $password);
!  
                        return $ldappassword;
                }
--- 1294,1298 ----
                        $password = crypt($userpass);
                        $ldappassword = sprintf('%s%s', $lcrypt, $password);
! 
                        return $ldappassword;
                }
***************
*** 1302,1306 ****
                @param $userpass user password
                @param $random random seed
!               */ 
                function md5_cryptpasswd($userpass, $random)
                {
--- 1302,1306 ----
                @param $userpass user password
                @param $random random seed
!               */
                function md5_cryptpasswd($userpass, $random)
                {
***************
*** 1314,1318 ****
                        return $ldappassword;
                }
! 
                function sha_cryptpasswd($userpass)
                {
--- 1314,1322 ----
                        return $ldappassword;
                }
!               /*!
!               @function sha_cryptpasswd
!               @abstract sha encrypt password
!               @param $userpass user password
!               */
                function sha_cryptpasswd($userpass)
                {