[Phpgroupware-cvs] qmailldap/inc class.uiqmailldap.inc.php, 1.11.2.1.2.6 class.boqmailldap.inc.php, 1.13.4.4

[ceb]

Update of qmailldap/inc

Modified Files:
     Branch: Version-0_9_16-branch
            class.uiqmailldap.inc.php lines: +13 -16
            class.boqmailldap.inc.php lines: +3 -3

Log Message:
update

====================================================
Index: qmailldap/inc/class.uiqmailldap.inc.php
diff -u qmailldap/inc/class.uiqmailldap.inc.php:1.11.2.1.2.5 
qmailldap/inc/class.uiqmailldap.inc.php:1.11.2.1.2.6
--- qmailldap/inc/class.uiqmailldap.inc.php:1.11.2.1.2.5        Wed Mar  2 
16:14:12 2005
+++ qmailldap/inc/class.uiqmailldap.inc.php     Wed Mar  2 16:38:21 2005
@@ -26,17 +26,14 @@

                function uiqmailldap()
                {
-                       $this->cats                             = 
CreateObject('phpgwapi.categories');
-                       $this->nextmatchs               = 
CreateObject('phpgwapi.nextmatchs');
-                       $this->boqmailldap              = 
CreateObject('qmailldap.boqmailldap');
-
-                       $this->rowColor[0]              = 
$GLOBALS['phpgw_info']['theme']['row_on'];
-                       $this->rowColor[1]              = 
$GLOBALS['phpgw_info']['theme']['row_off'];
+                       //$this->cats           = 
CreateObject('phpgwapi.categories');
+                       $this->nextmatchs       = 
CreateObject('phpgwapi.nextmatchs');
+                       $this->boqmailldap      = 
CreateObject('qmailldap.boqmailldap');

-                       $this->dataRowColor[0]  = 
$GLOBALS['phpgw_info']['theme']['bg01'];
-                       $this->dataRowColor[1]  = 
$GLOBALS['phpgw_info']['theme']['bg02'];
+                       $this->rowColor[0]      = 
$GLOBALS['phpgw_info']['theme']['row_on'];
+                       $this->rowColor[1]      = 
$GLOBALS['phpgw_info']['theme']['row_off'];
                }
-
+
                function addServer()
                {
                        $this->display_app_header();
@@ -150,10 +147,10 @@

                function deleteServer()
                {
-                       
$this->boqmailldap->deleteServer($GLOBALS['HTTP_GET_VARS']['serverid']);
+                       $this->boqmailldap->deleteServer($_GET['serverid']);
                        $this->listServers();
                }
-
+
                function display_app_header()
                {
                        $GLOBALS['phpgw']->common->phpgw_header();
@@ -231,13 +228,13 @@

                                        if (count($ldapData['smtproutes']) > 0)
                                        {
-                                               for ($i=0;$i < 
count($ldapData['smtproutes']); $i++)
+                                               for 
($i=0;$i<count($ldapData['smtproutes']);++$i)
                                                {
                                                        $smtproute = 
explode(':',$ldapData['smtproutes'][$i]);
                                                        
$GLOBALS['phpgw']->template->set_var('domain_name',$smtproute[0]);
                                                        
$GLOBALS['phpgw']->template->set_var('remote_server',$smtproute[1]);
                                                        
$GLOBALS['phpgw']->template->set_var('remote_port',$smtproute[2]);
-                                                       
$GLOBALS['phpgw']->template->set_var('row_color',$this->dataRowColor[($i)%2]);
+
                                                        $linkData = array
                                                        (
                                                                'menuaction'    
=> 'qmailldap.uiqmailldap.save',
@@ -364,7 +361,7 @@
                                                'serverid'              => 
$serverList[$i]['id']
                                        );
                                        
$GLOBALS['phpgw']->template->set_var('delete_link',$GLOBALS['phpgw']->link('/index.php',$linkData));
-                                       
$GLOBALS['phpgw']->template->set_var('row_color',$this->rowColor[$i%2]);
+                                       
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
                                        
$GLOBALS['phpgw']->template->parse('rows','row',True);
                                }
                        }
@@ -387,7 +384,7 @@
                        $values['bo_action']    = $bo_action;
                        $values['serverid']             = $serverid;
                        $this->boqmailldap->save($values);
-                       if ($bo_action' == 'save_ldap')
+                       if ($bo_action == 'save_ldap')
                        {
                                $this->listServers();
                        }

====================================================
Index: qmailldap/inc/class.boqmailldap.inc.php
diff -u qmailldap/inc/class.boqmailldap.inc.php:1.13.4.3 
qmailldap/inc/class.boqmailldap.inc.php:1.13.4.4
--- qmailldap/inc/class.boqmailldap.inc.php:1.13.4.3    Wed Mar  2 16:14:11 2005
+++ qmailldap/inc/class.boqmailldap.inc.php     Wed Mar  2 16:38:21 2005
@@ -179,7 +179,7 @@
                                                {
                                                        
$newRcpthosts[$i]=$value;
                                                        #print "!! $i: 
$value<br>";
-                                                       $i++;
+                                                       ++$i;
                                                }
                                        }
                                        
$this->sessionData[$serverid]['rcpthosts'] = $newRcpthosts;
@@ -196,7 +196,7 @@
                                                {
                                                        
$newSmtproutes[$i]=$value;
                                                        #print "!! $i: 
$value<br>";
-                                                       $i++;
+                                                       ++$i;
                                                }
                                        }
                                        
$this->sessionData[$serverid]['smtproutes'] = $newSmtproutes;