[Phpgroupware-cvs] qmailldap/inc class.uiqmailldap.inc.php, 1.11.2.1.2.4 class.boqmailldap.inc.php, 1.13.4.2

[ceb]

Update of qmailldap/inc

Modified Files:
     Branch: Version-0_9_16-branch
            class.uiqmailldap.inc.php lines: +11 -20
            class.boqmailldap.inc.php lines: +2 -4

Log Message:
ldap fix

====================================================
Index: qmailldap/inc/class.uiqmailldap.inc.php
diff -u qmailldap/inc/class.uiqmailldap.inc.php:1.11.2.1.2.3 
qmailldap/inc/class.uiqmailldap.inc.php:1.11.2.1.2.4
--- qmailldap/inc/class.uiqmailldap.inc.php:1.11.2.1.2.3        Mon Feb 28 
17:50:06 2005
+++ qmailldap/inc/class.uiqmailldap.inc.php     Mon Feb 28 19:11:58 2005
@@ -163,7 +163,6 @@
                function editServer($_serverid='', $_pagenumber='')
                {
                        $serverid               = 
get_var('serverid',array('POST','GET'));
-                       $HTTP_GET_VARS  = get_var('HTTP_GET_VARS',array('GET'));
                        $pagenumber             = 
get_var('pagenumber',array('POST','GET'));

                        if(!empty($_serverid))
@@ -199,39 +198,32 @@
                                case '0':
                                        if (count($ldapData['rcpthosts']) > 0)
                                        {
-                                               $selectBox  = "<select 
size=\"10\" name=\"rcpthosts\">\n";
+                                               $selectBox  = '<select 
size="10" name="rcpthosts">' . "\n";
                                                for ($i=0;$i < 
count($ldapData['rcpthosts']); $i++)
                                                {
-                                                       $selectBox .= "<option 
value=\"$i\">".
-                                                                       
$ldapData['rcpthosts'][$i].
-                                                                       
"</option>\n";
+                                                       $selectBox .= '<option 
value="' . $i .'">' . $ldapData['rcpthosts'][$i] . '</option>' . "\n";
                                                }
-                                               $selectBox .= "</select>\n";
+                                               $selectBox .= '</select>' . 
"\n";
                                                
$GLOBALS['phpgw']->template->set_var('rcpt_selectbox',$selectBox);
                                        }
                                        else
                                        {
-                                               
$GLOBALS['phpgw']->template->set_var('rcpt_selectbox',
-                                                       "<b>" . lang("We don't 
accept any email!") . "</b>");
+                                               
$GLOBALS['phpgw']->template->set_var('rcpt_selectbox','<b>' . lang("We don't 
accept any email!") . '</b>');
                                        }

-
                                        if (count($ldapData['locals']) > 0)
                                        {
-                                               $selectBox  = "<select 
size=\"10\" name=\"locals\">\n";
+                                               $selectBox  = '<select 
size="10" name="locals">' . "\n";
                                                for ($i=0;$i < 
count($ldapData['locals']); $i++)
                                                {
-                                                       $selectBox .= "<option 
value=\"$i\">".
-                                                                       
$ldapData['locals'][$i].
-                                                                       
"</option>\n";
+                                                       $selectBox .= '<option 
value="' . $i . '">' . $ldapData['locals'][$i] . '</option>' . "\n";
                                                }
-                                               $selectBox .= "</select>\n";
+                                               $selectBox .= '</select>' . 
"\n";
                                                
$GLOBALS['phpgw']->template->set_var('locals_selectbox',$selectBox);
                                        }
                                        else
                                        {
-                                               
$GLOBALS['phpgw']->template->set_var('locals_selectbox',
-                                                       "<b>".lang('We do not 
deliver any email locally !')."</b>");
+                                               
$GLOBALS['phpgw']->template->set_var('locals_selectbox','<b>' . lang('We do not 
deliver any email locally !') . '</b>');
                                        }
                                        break;
                                case '15':
@@ -288,7 +280,6 @@
                function editSettings($_serverid='')
                {
                        $serverid               = 
get_var('serverid',array('POST','GET'));
-                       $HTTP_GET_VARS  = get_var('HTTP_GET_VARS',array('GET'));

                        if(!empty($_serverid))
                        {
@@ -392,13 +383,13 @@
                        $HTTP_GET_VARS  = get_var('HTTP_GET_VARS',array('GET'));

                        $this->boqmailldap->save($HTTP_POST_VARS, 
$HTTP_GET_VARS);
-                       if ($HTTP_POST_VARS['bo_action'] == 'save_ldap' || 
$HTTP_GET_VARS['bo_action'] == 'save_ldap')
+                       if ($_POST['bo_action'] == 'save_ldap' || 
$_GET['bo_action'] == 'save_ldap')
                        {
                                $this->listServers();
                        }
                        else
                        {
-                               
$this->editServer($HTTP_GET_VARS['serverid'],$HTTP_GET_VARS['pagenumber']);
+                               
$this->editServer($_GET['serverid'],$_GET['pagenumber']);
                        }
                }


====================================================
Index: qmailldap/inc/class.boqmailldap.inc.php
diff -u qmailldap/inc/class.boqmailldap.inc.php:1.13.4.1 
qmailldap/inc/class.boqmailldap.inc.php:1.13.4.2
--- qmailldap/inc/class.boqmailldap.inc.php:1.13.4.1    Tue Apr 22 15:22:27 2003
+++ qmailldap/inc/class.boqmailldap.inc.php     Mon Feb 28 19:11:57 2005
@@ -39,9 +39,7 @@

                function getLDAPData($_serverid, $_nocache=0)
                {
-                       $HTTP_GET_VARS = get_var('HTTP_GET_VARS',array('GET'));
-
-                       if ($HTTP_GET_VARS['nocache'] == '1' || $_nocache == 
'1')
+                       if ($_GET['nocache'] == '1' || $_nocache == '1')
                        {
                                #print "option1<br>";
                                $LDAPData = 
$this->soqmailldap->getLDAPData($_serverid);