[Phpgroupware-cvs] qmailldap/inc class.uiqmailldap.inc.php, 1.11.2.1.2.3 class.uiuserdata.inc.php, 1.6.4.2

[ceb]

Update of qmailldap/inc

Modified Files:
     Branch: Version-0_9_16-branch
            class.uiqmailldap.inc.php lines: +3 -13
            class.uiuserdata.inc.php lines: +10 -18

Log Message:
ldap fix

====================================================
Index: qmailldap/inc/class.uiqmailldap.inc.php
diff -u qmailldap/inc/class.uiqmailldap.inc.php:1.11.2.1.2.2 
qmailldap/inc/class.uiqmailldap.inc.php:1.11.2.1.2.3
--- qmailldap/inc/class.uiqmailldap.inc.php:1.11.2.1.2.2        Sat Jan 31 
07:42:12 2004
+++ qmailldap/inc/class.uiqmailldap.inc.php     Mon Feb 28 17:50:06 2005
@@ -1,6 +1,6 @@
 <?php
        
/***************************************************************************\
-       * phpGroupWare - Notes                                                  
    *
+       * phpGroupWare - QMailLDAP                                              
    *
        * http://www.phpgroupware.org                                           
    *
        * Written by: Lars Kneschke address@hidden                            *
        * ----------------------------------------------                        
    *
@@ -62,18 +62,13 @@
                                'menuaction' => 'qmailldap.uiqmailldap.save'
                        );
                        
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php',$linkData));
-
                        $GLOBALS['phpgw']->template->pfp('out','main');
-                       $GLOBALS['phpgw']->common->phpgw_footer();
                }

                function addSmtpRoute()
                {
                        $this->display_app_header();
-
                        $this->translate();
-
-                       $GLOBALS['phpgw']->common->phpgw_footer();
                }

                function createMenu($_serverid, $_pagenumber, $_ldapData)
@@ -288,7 +283,6 @@
                                        break;
                        }
                        $GLOBALS['phpgw']->template->pfp('out','main');
-                       $GLOBALS['phpgw']->common->phpgw_footer();
                }

                function editSettings($_serverid='')
@@ -337,7 +331,6 @@
                        
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php',$linkData));

                        $GLOBALS['phpgw']->template->pfp('out','main');
-                       $GLOBALS['phpgw']->common->phpgw_footer();
                }

                function listServers()
@@ -390,12 +383,9 @@
                                'menuaction'    => 
'qmailldap.uiqmailldap.addServer'
                        );
                        
$GLOBALS['phpgw']->template->set_var('add_link',$GLOBALS['phpgw']->link('/index.php',$linkData));
-
-                       $GLOBALS['phpgw']->template->parse('out','main');
-                       $GLOBALS['phpgw']->common->phpgw_footer();
+                       $GLOBALS['phpgw']->template->pfp('out','main');
                }

-
                function save()
                {
                        $HTTP_POST_VARS = 
get_var('HTTP_POST_VARS',array('POST'));

====================================================
Index: qmailldap/inc/class.uiuserdata.inc.php
diff -u qmailldap/inc/class.uiuserdata.inc.php:1.6.4.1 
qmailldap/inc/class.uiuserdata.inc.php:1.6.4.2
--- qmailldap/inc/class.uiuserdata.inc.php:1.6.4.1      Tue Apr 22 15:22:27 2003
+++ qmailldap/inc/class.uiuserdata.inc.php      Mon Feb 28 17:50:06 2005
@@ -37,20 +37,16 @@

                function editUserData($_useCache='0')
                {
-                       $HTTP_GET_VARS = get_var('HTTP_GET_VARS',array('GET'));
-
-                       $accountID = $HTTP_GET_VARS['account_id'];
+                       $account_id = get_var('account_id',array('GET'));

                        $this->display_app_header();
-
                        $this->translate();
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('qmailldap') . ': ' . lang('edit user data');

-
                        
$GLOBALS['phpgw']->template->set_file(array('editUserData' => 
'edituserdata.tpl'));
                        
$GLOBALS['phpgw']->template->set_block('editUserData','form','form');
                        
$GLOBALS['phpgw']->template->set_block('editUserData','link_row','link_row');
-
+
                        
$GLOBALS['phpgw']->template->set_var('lang_email_config',lang('edit email 
settings'));
                        
$GLOBALS['phpgw']->template->set_var('lang_emailAddress',lang('email address'));
                        
$GLOBALS['phpgw']->template->set_var('lang_emailaccount_active',lang('email 
account active'));
@@ -66,12 +62,12 @@
                        $linkData = array
                        (
                                'menuaction'    => 
'qmailldap.uiuserdata.saveUserData',
-                               'account_id'    => $accountID
+                               'account_id'    => $account_id
                        );
                        
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php',$linkData));

                        // only when we show a existing user
-                       if($userData = 
$this->boqmailldap->getUserData($accountID, $_useCache))
+                       if($userData = 
$this->boqmailldap->getUserData($account_id, $_useCache))
                        {
                                if ($userData['mailAlternateAddress'] != '')
                                {
@@ -97,10 +93,8 @@
                                
$GLOBALS['phpgw']->template->set_var('deliveryProgramPath',$userData["deliveryProgramPath"]);

                                
$GLOBALS['phpgw']->template->set_var('uid',rawurlencode($_accountData['dn']));
-                               if ($userData['accountStatus'] == 'active')
-                                       
$GLOBALS['phpgw']->template->set_var('account_checked','checked');
-                               if ($_accountData['deliverExtern'] == 'active')
-                                       
$GLOBALS['phpgw']->template->set_var('deliver_checked','checked');
+                               
$GLOBALS['phpgw']->template->set_var('account_checked',($userData['accountStatus']
 == 'active'?'checked':''));
+                               
$GLOBALS['phpgw']->template->set_var('deliver_checked',($_accountData['deliverExtern']
 == 'active'?'checked':''));
                        }
                        else
                        {
@@ -114,15 +108,13 @@
                        // create the menu on the left, if needed
                        $menuClass = CreateObject('admin.uimenuclass');
                        
$GLOBALS['phpgw']->template->set_var('rows',$menuClass->createHTMLCode('edit_user'));
-
                        $GLOBALS['phpgw']->template->pfp('out','form');
-
                }
-
+
                function saveUserData()
                {
                        $HTTP_POST_VARS = 
get_var('HTTP_POST_VARS',array('POST'));
-                       $HTTP_GET_VARS  = get_var('HTTP_GET_VARS',array('GET'));
+                       $account_id     = get_var('account_id',array('GET'));

                        if($HTTP_POST_VARS['accountStatus'] == 'on')
                        {
@@ -144,7 +136,7 @@
                        if($HTTP_POST_VARS['remove_mailAlternateAddress']) 
$bo_action='remove_mailAlternateAddress';
                        if($HTTP_POST_VARS['save']) $bo_action='save';

-                       
$this->boqmailldap->saveUserData($HTTP_GET_VARS['account_id'], $formData, 
$bo_action);
+                       $this->boqmailldap->saveUserData($account_id, 
$formData, $bo_action);

                        if ($bo_action == 'save')
                        {