[Phpgroupware-cvs] qmailldap/inc class.uiuserdata.inc.php,1.6.4.3

[ceb]

Update of qmailldap/inc

Modified Files:
     Branch: Version-0_9_16-branch
            class.uiuserdata.inc.php lines: +16 -16

Log Message:
ldap fix

====================================================
Index: qmailldap/inc/class.uiuserdata.inc.php
diff -u qmailldap/inc/class.uiuserdata.inc.php:1.6.4.2 
qmailldap/inc/class.uiuserdata.inc.php:1.6.4.3
--- qmailldap/inc/class.uiuserdata.inc.php:1.6.4.2      Mon Feb 28 17:50:06 2005
+++ qmailldap/inc/class.uiuserdata.inc.php      Mon Feb 28 18:08:46 2005
@@ -90,10 +90,10 @@
                                
$GLOBALS['phpgw']->template->set_var('options_mailAlternateAddress',$options_mailAlternateAddress);
                                
$GLOBALS['phpgw']->template->set_var('mailRoutingAddress',$userData['mailRoutingAddress']);
                                
$GLOBALS['phpgw']->template->set_var('selected_'.$userData['qmailDotMode'],'selected');
-                               
$GLOBALS['phpgw']->template->set_var('deliveryProgramPath',$userData["deliveryProgramPath"]);
+                               
$GLOBALS['phpgw']->template->set_var('deliveryProgramPath',$userData['deliveryProgramPath']);

                                
$GLOBALS['phpgw']->template->set_var('uid',rawurlencode($_accountData['dn']));
-                               
$GLOBALS['phpgw']->template->set_var('account_checked',($userData['accountStatus']
 == 'active'?'checked':''));
+                               
$GLOBALS['phpgw']->template->set_var('account_checked',($userData['accountStatus']
 == 'active'?'checked':''));
                                
$GLOBALS['phpgw']->template->set_var('deliver_checked',($_accountData['deliverExtern']
 == 'active'?'checked':''));
                        }
                        else
@@ -113,28 +113,27 @@

                function saveUserData()
                {
-                       $HTTP_POST_VARS = 
get_var('HTTP_POST_VARS',array('POST'));
                        $account_id     = get_var('account_id',array('GET'));

-                       if($HTTP_POST_VARS['accountStatus'] == 'on')
+                       if($_POST['accountStatus'] == 'on')
                        {
                                $accountStatus = 'active';
                        }

                        $formData = array
                        (
-                               'mailLocalAddress'                              
=> $HTTP_POST_VARS['mailLocalAddress'],
-                               'mailRoutingAddress'                    => 
$HTTP_POST_VARS['mailRoutingAddress'],
-                               'add_mailAlternateAddress'              => 
$HTTP_POST_VARS['mailAlternateAddressInput'],
-                               'remove_mailAlternateAddress'   => 
$HTTP_POST_VARS['mailAlternateAddress'],
-                               'qmailDotMode'                                  
=> $HTTP_POST_VARS['qmailDotMode'],
-                               'deliveryProgramPath'                   => 
$HTTP_POST_VARS['deliveryProgramPath'],
-                               'accountStatus'                                 
=> $accountStatus
+                               'mailLocalAddress'                              
=> $_POST['mailLocalAddress'],
+                               'mailRoutingAddress'                    => 
$_POST['mailRoutingAddress'],
+                               'add_mailAlternateAddress'              => 
$_POST['mailAlternateAddressInput'],
+                               'remove_mailAlternateAddress'   => 
$_POST['mailAlternateAddress'],
+                               'qmailDotMode'                                  
=> $_POST['qmailDotMode'],
+                               'deliveryProgramPath'                   => 
$_POST['deliveryProgramPath'],
+                               'accountStatus'                                 
=> $_POST['accountStatus']
                        );
-
-                       if($HTTP_POST_VARS['add_mailAlternateAddress']) 
$bo_action='add_mailAlternateAddress';
-                       if($HTTP_POST_VARS['remove_mailAlternateAddress']) 
$bo_action='remove_mailAlternateAddress';
-                       if($HTTP_POST_VARS['save']) $bo_action='save';
+
+                       if($_POST['add_mailAlternateAddress']) 
$bo_action='add_mailAlternateAddress';
+                       if($_POST['remove_mailAlternateAddress']) 
$bo_action='remove_mailAlternateAddress';
+                       if($_POST['save']) $bo_action='save';

                        $this->boqmailldap->saveUserData($account_id, 
$formData, $bo_action);

@@ -142,6 +141,7 @@
                        {
                                // read date fresh from ldap storage
                                $this->editUserData();
+                               
//$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=qmailldap.uiqmailldap.editUserData&account_id='
 . $account_id);
                        }
                        else
                        {