[Phpgroupware-cvs] qmailldap/inc class.soqmailldap.inc.php, 1.13.2.2.2.3 class.uiqmailldap.inc.php, 1.11.2.1.2.7

[ceb]

Update of qmailldap/inc

Modified Files:
     Branch: Version-0_9_16-branch
            class.soqmailldap.inc.php lines: +29 -38
            class.uiqmailldap.inc.php lines: +9 -5

Log Message:
update

====================================================
Index: qmailldap/inc/class.soqmailldap.inc.php
diff -u qmailldap/inc/class.soqmailldap.inc.php:1.13.2.2.2.2 
qmailldap/inc/class.soqmailldap.inc.php:1.13.2.2.2.3
--- qmailldap/inc/class.soqmailldap.inc.php:1.13.2.2.2.2        Mon Feb 28 
17:06:55 2005
+++ qmailldap/inc/class.soqmailldap.inc.php     Wed Mar  2 22:26:59 2005
@@ -55,7 +55,7 @@
                        }
                        else
                        {
-                               return false;
+                               return False;
                        }
                }

@@ -77,8 +77,8 @@

                                $data = array
                                (
-                                       'rcpthosts'     => 
$allValues[0]['rcpthosts'],
-                                       'locals'        => 
$allValues[0]['locals'],
+                                       'rcpthosts'             => 
$allValues[0]['rcpthosts'],
+                                       'locals'                => 
$allValues[0]['locals'],
                                        'smtproutes'    => 
$allValues[0]['smtproutes'],
                                        'ldapbasedn'    => 
$allValues[0]['ldapbasedn'][0]
                                );
@@ -113,11 +113,10 @@
                        }
                        else
                        {
-                               return false;
+                               return False;
                        }
-
                }
-
+
                function getServerList()
                {
                        $query = "select id,qmail_servername,description from 
phpgw_qmailldap";
@@ -194,7 +193,7 @@
                        }
                        else
                        {
-                               return false;
+                               return False;
                        }

                        $mail_address           = $this->mail_address;
@@ -202,22 +201,22 @@

                        $newData = array
                        (
-                               $mail_address   => 
$_accountData["mailLocalAddress"],
-                               'objectclass'   => "qmailUser"
+                               $mail_address   => 
$_accountData['mailLocalAddress'],
+                               'objectclass'   => 'qmailUser'
                        );

                        @ldap_mod_add($ldap, $accountDN, $newData);

                        if(empty($homedirectory))
                        {
-                               $homedirectory = "/home/".$uid;
+                               $homedirectory = '/home/' . $uid;
                        }

                        $newData = array
                        (
                                $mail_address           => 
(isset($_accountData['mailLocalAddress'])?$_accountData['mailLocalAddress']:$uid
 . '@localhost'),
                 'homeDirectory'     => $homedirectory,
-                'mailMessageStore'  => $homedirectory."/Maildir/",
+                'mailMessageStore'  => $homedirectory . '/Maildir/',
                 'qmailDotMode'      => 
(isset($_accountData['qmailDotMode'])?$_accountData['qmailDotMode']:'ldaponly')
                        );

@@ -226,25 +225,22 @@
                                $newData['accountStatus'] = 
$_accountData['accountStatus'];
                        }

-                       if ($_accountData["mailAlternateAddress"])
+                       if ($_accountData['mailAlternateAddress'])
                        {
-                               $newData['mailAlternateAddress'] = 
$_accountData["mailAlternateAddress"];
+                               $newData['mailAlternateAddress'] = 
$_accountData['mailAlternateAddress'];
                        }

-                       if ($_accountData["mailRoutingAddress"])
+                       if ($_accountData['mailRoutingAddress'])
                        {
-                               $newData[$routing_address] = 
$_accountData["mailRoutingAddress"];
+                               $newData[$routing_address] = 
$_accountData['mailRoutingAddress'];
                        }

-                       if ($_accountData["deliveryProgramPath"])
+                       if ($_accountData['deliveryProgramPath'])
                        {
-                               $newData['deliveryProgramPath'] = 
$_accountData["deliveryProgramPath"];
+                               $newData['deliveryProgramPath'] = 
$_accountData['deliveryProgramPath'];
                        }
-
                        //_debug_array($newData);
-
                        ldap_mod_replace ($ldap, $accountDN, $newData);
-
                        //print ldap_error($ldap);
                }

@@ -252,24 +248,19 @@
                {
                        switch ($_action)
                        {
-                               case "add_server":
-                                       $query = sprintf("insert into 
phpgw_qmailldap (description, ldap_basedn, qmail_servername)
-                                                       values 
('%s','%s','%s')",
+                               case 'add_server':
+                                       $query = sprintf("insert into 
phpgw_qmailldap (description, ldap_basedn, qmail_servername) values 
('%s','%s','%s')",
                                                        $_data['description'],
                                                        $_data['ldap_basedn'],
-                                                       
$_data["qmail_servername"]);
+                                                       
$_data['qmail_servername']);
                                        $this->db->query($query);
                                        break;
-
-                               case "update_server":
-                                       $query = sprintf("update 
phpgw_qmailldap set
-                                                         description='%s',
-                                                         ldap_basedn='%s',
-                                                         qmail_servername='%s' 
where id='%s'",
+                               case 'update_server':
+                                       $query = sprintf("update 
phpgw_qmailldap set description='%s',ldap_basedn='%s',qmail_servername='%s' 
where id='%s'",
                                                $_data['description'],
                                                $_data['ldap_basedn'],
-                                               $_data["qmail_servername"],
-                                               $_data["id"]);
+                                               $_data['qmail_servername'],
+                                               $_data['id']);
                                        $this->db->query($query);
                                        break;
                        }
@@ -288,15 +279,15 @@
                        @ldap_read($ds,$storageData['ldap_basedn'], $filter);
                        if (ldap_errno($ds) == 32)
                        {
-                               $ldapData["objectclass"][0]     = 
"qmailcontrol";
-                               $ldapData["cn"]                 = 
$storageData['qmail_servername'];
+                               $ldapData['objectclass'][0] = 'qmailcontrol';
+                               $ldapData['cn']                 = 
$storageData['qmail_servername'];
                                
ldap_add($ds,$storageData['ldap_basedn'],$ldapData);
                        }

-                       $ldapData['rcpthosts']          = $_data['rcpthosts'];
+                       $ldapData['rcpthosts']  = $_data['rcpthosts'];
                        $ldapData['locals']             = $_data['locals'];
-                       $ldapData['smtproutes']         = $_data['smtproutes'];
-
+                       $ldapData['smtproutes'] = $_data['smtproutes'];
+
                        ldap_modify($ds,$storageData['ldap_basedn'],$ldapData);
                }
        }

====================================================
Index: qmailldap/inc/class.uiqmailldap.inc.php
diff -u qmailldap/inc/class.uiqmailldap.inc.php:1.11.2.1.2.6 
qmailldap/inc/class.uiqmailldap.inc.php:1.11.2.1.2.7
--- qmailldap/inc/class.uiqmailldap.inc.php:1.11.2.1.2.6        Wed Mar  2 
16:38:21 2005
+++ qmailldap/inc/class.uiqmailldap.inc.php     Wed Mar  2 22:26:59 2005
@@ -186,7 +186,7 @@
                        (
                                'menuaction'    => 'qmailldap.uiqmailldap.save',
                                'pagenumber'    => $pagenumber,
-                               'serverid'      => $serverid
+                               'serverid'              => $serverid
                        );
                        
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php',$linkData));

@@ -254,7 +254,7 @@
                                                'pagenumber'    => 15,
                                                'serverid'              => 
$serverid
                                        );
-                                       
$GLOBALS['phpgw']->template->set_var('last_row_color',$this->dataRowColor[($i)%2]);
+                                       
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
                                        
$GLOBALS['phpgw']->template->set_var('add_route_link',$GLOBALS['phpgw']->link('/index.php',$linkData));
                                        break;
                                case '20':
@@ -276,7 +276,7 @@

                function editSettings($_serverid='')
                {
-                       $serverid               = 
get_var('serverid',array('POST','GET'));
+                       $serverid = get_var('serverid',array('POST','GET'));

                        if(!empty($_serverid))
                        {
@@ -368,7 +368,7 @@

                        $linkData = array
                        (
-                               'menuaction'    => 
'qmailldap.uiqmailldap.addServer'
+                               'menuaction' => 
'qmailldap.uiqmailldap.addServer'
                        );
                        
$GLOBALS['phpgw']->template->set_var('add_link',$GLOBALS['phpgw']->link('/index.php',$linkData));
                        $GLOBALS['phpgw']->template->pfp('out','main');
@@ -379,10 +379,14 @@
                        $bo_action      = 
get_var('bo_action',array('POST','GET'));
                        $serverid       = 
get_var('serverid',array('POST','GET'));
                        $pagenumber     = 
get_var('pagenumber',array('POST','GET'));
+                       $smtproute_id = $_GET['smtproute_id'];
+
                        $values = get_var('values',array('POST','GET'));

                        $values['bo_action']    = $bo_action;
                        $values['serverid']             = $serverid;
+                       $values['smtproute_id'] = $_GET['smtproute_id'];
+
                        $this->boqmailldap->save($values);
                        if ($bo_action == 'save_ldap')
                        {