[Phpgroupware-cvs] CVS: admin/inc hook_config.inc.php,1.4,1.5

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv27596/admin/inc

Modified Files:
        hook_config.inc.php 
Log Message:
Add in sha passwd crypt for ldap (requires mhash to configure and use) ...
Concept by Matt Pavlovich <address@hidden>



Index: hook_config.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/hook_config.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** hook_config.inc.php 2 Jan 2002 18:20:10 -0000       1.4
--- hook_config.inc.php 14 May 2002 01:02:19 -0000      1.5
***************
*** 25,29 ****
                        $found = False;
  
!                       while (list ($key, $value) = each ($algos))
                        {
                                $found = True;
--- 25,29 ----
                        $found = False;
  
!                       while(list($key, $value) = each($algos))
                        {
                                $found = True;
***************
*** 31,35 ****
                                if(!in_array($value,$listed))
                                {
!                                       if ($config['mcrypt_algo'] == $value)
                                        {
                                                $selected = ' selected';
--- 31,35 ----
                                if(!in_array($value,$listed))
                                {
!                                       if($config['mcrypt_algo'] == $value)
                                        {
                                                $selected = ' selected';
***************
*** 40,44 ****
                                        }
                                        $descr = strtoupper($value);
!       
                                        $out .= '<option value="' . $value . 
'"' . $selected . '>' . $descr . '</option>' . "\n";
                                        $listed[] = $value;
--- 40,44 ----
                                        }
                                        $descr = strtoupper($value);
! 
                                        $out .= '<option value="' . $value . 
'"' . $selected . '>' . $descr . '</option>' . "\n";
                                        $listed[] = $value;
***************
*** 70,74 ****
                        $found = False;
  
!                       while (list ($key, $value) = each ($modes))
                        {
                                $found = True;
--- 70,74 ----
                        $found = False;
  
!                       while(list($key, $value) = each($modes))
                        {
                                $found = True;
***************
*** 76,80 ****
                                if(!in_array($value,$listed))
                                {
!                                       if ($config['mcrypt_mode'] == $value)
                                        {
                                                $selected = ' selected';
--- 76,80 ----
                                if(!in_array($value,$listed))
                                {
!                                       if($config['mcrypt_mode'] == $value)
                                        {
                                                $selected = ' selected';
***************
*** 85,89 ****
                                        }
                                        $descr = strtoupper($value);
!       
                                        $out .= '<option value="' . $value . 
'"' . $selected . '>' . $descr . '</option>' . "\n";
                                        $listed[] = $value;
--- 85,89 ----
                                        }
                                        $descr = strtoupper($value);
! 
                                        $out .= '<option value="' . $value . 
'"' . $selected . '>' . $descr . '</option>' . "\n";
                                        $listed[] = $value;
***************
*** 99,102 ****
--- 99,130 ----
                {
                        $out = '<option value="cbc" selected>CBC</option>' . 
"\n";
+               }
+               return $out;
+       }
+ 
+       function passwdhashes($config)
+       {
+               $hashes = array(
+                       'des' => 'des',
+                       'md5' => 'md5'
+               );
+               if(@function_exists('mhash'))
+               {
+                       $hashes += array('sha' => 'sha');
+               }
+ 
+               while(list($key, $value) = each($hashes))
+               {
+                       if($config['ldap_encryption_type'] == $value)
+                       {
+                               $selected = ' selected';
+                       }
+                       else
+                       {
+                               $selected = '';
+                       }
+                       $descr = strtoupper($value);
+ 
+                       $out .= '<option value="' . $value . '"' . $selected . 
'>' . $descr . '</option>' . "\n";
                }
                return $out;