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

[ceb]

Update of qmailldap/inc

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

Log Message:
ldap fix

====================================================
Index: qmailldap/inc/class.uiuserdata.inc.php
diff -u qmailldap/inc/class.uiuserdata.inc.php:1.6.4.3 
qmailldap/inc/class.uiuserdata.inc.php:1.6.4.4
--- qmailldap/inc/class.uiuserdata.inc.php:1.6.4.3      Mon Feb 28 18:08:46 2005
+++ qmailldap/inc/class.uiuserdata.inc.php      Mon Feb 28 18:51:28 2005
@@ -23,12 +23,8 @@
                function uiuserdata()
                {
                        $this->boqmailldap      = 
CreateObject('qmailldap.boqmailldap');
-
-                       $this->rowColor[0]      = 
$GLOBALS['phpgw_info']["theme"]["bg01"];
-                       $this->rowColor[1]      = 
$GLOBALS['phpgw_info']["theme"]["bg02"];
-
                }
-
+
                function display_app_header()
                {
                        $GLOBALS['phpgw']->common->phpgw_header();
@@ -53,10 +49,8 @@
                        
$GLOBALS['phpgw']->template->set_var('lang_mailAlternateAddress',lang('alternate
 email address'));
                        
$GLOBALS['phpgw']->template->set_var('lang_mailRoutingAddress',lang('forward 
emails to'));
                        
$GLOBALS['phpgw']->template->set_var('lang_forward_also_to',lang('forward also 
to'));
-                       
$GLOBALS['phpgw']->template->set_var('lang_button',lang('save'));
                        
$GLOBALS['phpgw']->template->set_var('lang_deliver_extern',lang('deliver 
extern'));
                        
$GLOBALS['phpgw']->template->set_var('lang_edit_email_settings',lang('edit 
email settings'));
-                       
$GLOBALS['phpgw']->template->set_var('lang_ready',lang('Done'));
                        
$GLOBALS['phpgw']->template->set_var('link_back',$GLOBALS['phpgw']->link('/admin/accounts.php'));

                        $linkData = array
@@ -71,20 +65,18 @@
                        {
                                if ($userData['mailAlternateAddress'] != '')
                                {
-                                       $options_mailAlternateAddress = 
"<select size=\"6\" name=\"mailAlternateAddress\">\n";
+                                       $options_mailAlternateAddress = 
'<select size="6" name="mailAlternateAddress">' . "\n";
                                        for ($i=0;$i < 
count($userData['mailAlternateAddress']); $i++)
                                        {
-                                               $options_mailAlternateAddress 
.= "<option value=\"$i\">".
-                                                       
$userData['mailAlternateAddress'][$i].
-                                                       "</option>\n";
+                                               $options_mailAlternateAddress 
.= '<option value="$i">' . $userData['mailAlternateAddress'][$i] . '</option>' 
. "\n";
                                        }
-                                       $options_mailAlternateAddress .= 
"</select>\n";
+                                       $options_mailAlternateAddress .= 
'</select>' . "\n";
                                }
                                else
                                {
                                        $options_mailAlternateAddress = 
lang('no alternate email address');
                                }
-
+
                                
$GLOBALS['phpgw']->template->set_var('mailLocalAddress',$userData['mailLocalAddress']);
                                
$GLOBALS['phpgw']->template->set_var('mailAlternateAddress','');
                                
$GLOBALS['phpgw']->template->set_var('options_mailAlternateAddress',$options_mailAlternateAddress);
@@ -113,13 +105,6 @@

                function saveUserData()
                {
-                       $account_id     = get_var('account_id',array('GET'));
-
-                       if($_POST['accountStatus'] == 'on')
-                       {
-                               $accountStatus = 'active';
-                       }
-
                        $formData = array
                        (
                                'mailLocalAddress'                              
=> $_POST['mailLocalAddress'],
@@ -131,17 +116,24 @@
                                'accountStatus'                                 
=> $_POST['accountStatus']
                        );

-                       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);
+                       if($_POST['save'])
+                       {
+                               $bo_action='save';
+                       }
+                       elseif($_POST['add_mailAlternateAddress'])
+                       {
+                               $bo_action='add_mailAlternateAddress';
+                       }
+                       elseif($_POST['remove_mailAlternateAddress'])
+                       {
+                               $bo_action='remove_mailAlternateAddress';
+                       }
+                       $this->boqmailldap->saveUserData($_GET['account_id'], 
$formData, $bo_action);

                        if ($bo_action == 'save')
                        {
                                // read date fresh from ldap storage
                                $this->editUserData();
-                               
//$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=qmailldap.uiqmailldap.editUserData&account_id='
 . $account_id);
                        }
                        else
                        {
@@ -149,15 +141,14 @@
                                $this->editUserData('1');
                        }
                }
-
+
                function translate()
                {
                        
$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
                        
$GLOBALS['phpgw']->template->set_var('tr_color1',$GLOBALS['phpgw_info']['theme']['row_on']);
                        
$GLOBALS['phpgw']->template->set_var('tr_color2',$GLOBALS['phpgw_info']['theme']['row_off']);
                        
$GLOBALS['phpgw']->template->set_var('lang_add',lang('add'));
-                       
$GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
-                       
$GLOBALS['phpgw']->template->set_var('lang_remove',lang('remove'));
+                       
$GLOBALS['phpgw']->template->set_var('lang_done',lang('done'));
                        
$GLOBALS['phpgw']->template->set_var('lang_remove',lang('remove'));
                        
$GLOBALS['phpgw']->template->set_var('lang_advanced_options',lang('advanced 
options'));
                        
$GLOBALS['phpgw']->template->set_var('lang_qmaildotmode',lang('qmaildotmode'));