[Phpgroupware-cvs] CVS: admin/inc class.uiconfig.inc.php,1.13,1.14 hook_config.inc.php,1.6,1.7

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.uiconfig.inc.php hook_config.inc.php 
Log Message:
moved all the setup mess to its right place

Index: class.uiconfig.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiconfig.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.uiconfig.inc.php      27 Oct 2002 15:56:16 -0000      1.13
--- class.uiconfig.inc.php      7 Dec 2002 02:11:10 -0000       1.14
***************
*** 36,46 ****
                        }
  
!                       switch($GLOBALS['HTTP_GET_VARS']['appname'])
                        {
                                case 'admin':
!                               case 'preferences':
!                                       $appname = 'preferences';
!                                       $config_appname = 'phpgwapi';
!                                       break;
                                case 'addressbook':
                                case 'calendar':
--- 36,45 ----
                        }
  
!                       $appname = $GLOBALS['HTTP_GET_VARS']['appname'];
!                       switch($appname)
                        {
                                case 'admin':
!                               //case 'preferences':
!                               //$appname = 'preferences';
                                case 'addressbook':
                                case 'calendar':
***************
*** 51,55 ****
                                        case 'bogusappname':
                                        */
-                                       $appname = 
$GLOBALS['HTTP_GET_VARS']['appname'];
                                        $config_appname = 'phpgwapi';
                                        break;
--- 50,53 ----
***************
*** 60,64 ****
                                        break;
                                default:
-                                       $appname = 
$GLOBALS['HTTP_GET_VARS']['appname'];
                                        $config_appname = $appname;
                                        break;
--- 58,61 ----

Index: hook_config.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/hook_config.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** hook_config.inc.php 29 Jun 2002 15:59:37 -0000      1.6
--- hook_config.inc.php 7 Dec 2002 02:11:10 -0000       1.7
***************
*** 13,122 ****
    /* $Id$ */
  
!       function encryptalgo($config)
        {
!               if(@function_exists('mcrypt_list_algorithms'))
!               {
!                       $listed = array();
!                       if(!isset($config['mcrypt_algo']))
!                       {
!                               $config['mcrypt_algo'] = 'tripledes';  /* 
MCRYPT_TRIPLEDES */
!                       }
!                       $algos = @mcrypt_list_algorithms();
!                       $found = False;
! 
!                       $out = '';
!                       while(list($key,$value) = each($algos))
!                       {
!                               $found = True;
!                               /* Only show each once - seems this is a 
problem in some installs */
!                               if(!in_array($value,$listed))
!                               {
!                                       if($config['mcrypt_algo'] == $value)
!                                       {
!                                               $selected = ' selected';
!                                       }
!                                       else
!                                       {
!                                               $selected = '';
!                                       }
!                                       $descr = strtoupper($value);
! 
!                                       $out .= '<option value="' . $value . 
'"' . $selected . '>' . $descr . '</option>' . "\n";
!                                       $listed[] = $value;
!                               }
!                       }
!                       if(!$found)
!                       {
!                               /* Something is wrong with their mcrypt install 
or php.ini */
!                               $out = '<option value="">' . lang('no 
algorithms available') . '</option>' . "\n";;
!                       }
!               }
!               else
!               {
!                       $out = '<option value="tripledes">TRIPLEDES</option>' . 
"\n";;
!               }
!               return $out;
!       }
! 
!       function encryptmode($config)
!       {
!               if(@function_exists('mcrypt_list_modes'))
!               {
!                       $listed = array();
!                       if(!isset($config['mcrypt_mode']))
!                       {
!                               $config['mcrypt_mode'] = 'cbc'; /* 
MCRYPT_MODE_CBC */
!                       }
!                       $modes = @mcrypt_list_modes();
!                       $found = False;
! 
!                       $out = '';
!                       while(list($key,$value) = each($modes))
!                       {
!                               $found = True;
!                               /* Only show each once - seems this is a 
problem in some installs */
!                               if(!in_array($value,$listed))
!                               {
!                                       if($config['mcrypt_mode'] == $value)
!                                       {
!                                               $selected = ' selected';
!                                       }
!                                       else
!                                       {
!                                               $selected = '';
!                                       }
!                                       $descr = strtoupper($value);
! 
!                                       $out .= '<option value="' . $value . 
'"' . $selected . '>' . $descr . '</option>' . "\n";
!                                       $listed[] = $value;
!                               }
!                       }
!                       if(!$found)
!                       {
!                               /* Something is wrong with their mcrypt install 
or php.ini */
!                               $out = '<option value="" selected>' . lang('no 
modes available') . '</option>' . "\n";
!                       }
!               }
!               else
!               {
!                       $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';
--- 13,27 ----
    /* $Id$ */
  
!       function country_set($config)
        {
!               $country  = array(
!                       'user_choice'  => 'Users Choice',
!                       'force_select' => 'Force Selectbox'
                );
  
!               $out = '';
!               while (list ($key, $value) = each ($country))
                {
!                       if ($config['countrylist'] == $key)
                        {
                                $selected = ' selected';
***************
*** 126,132 ****
                                $selected = '';
                        }
!                       $descr = strtoupper($value);
  
!                       $out .= '<option value="' . $value . '"' . $selected . 
'>' . $descr . '</option>' . "\n";
                }
                return $out;
--- 31,37 ----
                                $selected = '';
                        }
!                       $descr = lang($value);
  
!                       $out .= '<option value="' . $key . '"' . $selected . 
'>' . $descr . '</option>' . "\n";
                }
                return $out;