[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] qmailldap/inc class.uiqmailldap.inc.php, 1.11.2.1.2.5
|
From: |
ceb |
|
Subject: |
[Phpgroupware-cvs] qmailldap/inc class.uiqmailldap.inc.php, 1.11.2.1.2.5 class.boqmailldap.inc.php, 1.13.4.3 |
|
Date: |
Wed, 2 Mar 2005 17:14:00 +0100 |
Update of qmailldap/inc
Modified Files:
Branch: Version-0_9_16-branch
class.uiqmailldap.inc.php lines: +15 -11
class.boqmailldap.inc.php lines: +22 -26
Log Message:
update
====================================================
Index: qmailldap/inc/class.uiqmailldap.inc.php
diff -u qmailldap/inc/class.uiqmailldap.inc.php:1.11.2.1.2.4
qmailldap/inc/class.uiqmailldap.inc.php:1.11.2.1.2.5
--- qmailldap/inc/class.uiqmailldap.inc.php:1.11.2.1.2.4 Mon Feb 28
19:11:58 2005
+++ qmailldap/inc/class.uiqmailldap.inc.php Wed Mar 2 16:14:12 2005
@@ -198,7 +198,7 @@
case '0':
if (count($ldapData['rcpthosts']) > 0)
{
- $selectBox = '<select
size="10" name="rcpthosts">' . "\n";
+ $selectBox = '<select
size="10" name="values[rcpthosts]">' . "\n";
for ($i=0;$i <
count($ldapData['rcpthosts']); $i++)
{
$selectBox .= '<option
value="' . $i .'">' . $ldapData['rcpthosts'][$i] . '</option>' . "\n";
@@ -208,12 +208,12 @@
}
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 do not
accept any email') . '</b>');
}
if (count($ldapData['locals']) > 0)
{
- $selectBox = '<select
size="10" name="locals">' . "\n";
+ $selectBox = '<select
size="10" name="values[locals]">' . "\n";
for ($i=0;$i <
count($ldapData['locals']); $i++)
{
$selectBox .= '<option
value="' . $i . '">' . $ldapData['locals'][$i] . '</option>' . "\n";
@@ -223,7 +223,7 @@
}
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':
@@ -379,17 +379,21 @@
function save()
{
- $HTTP_POST_VARS =
get_var('HTTP_POST_VARS',array('POST'));
- $HTTP_GET_VARS = get_var('HTTP_GET_VARS',array('GET'));
-
- $this->boqmailldap->save($HTTP_POST_VARS,
$HTTP_GET_VARS);
- if ($_POST['bo_action'] == 'save_ldap' ||
$_GET['bo_action'] == 'save_ldap')
+ $bo_action =
get_var('bo_action',array('POST','GET'));
+ $serverid =
get_var('serverid',array('POST','GET'));
+ $pagenumber =
get_var('pagenumber',array('POST','GET'));
+ $values = get_var('values',array('POST','GET'));
+
+ $values['bo_action'] = $bo_action;
+ $values['serverid'] = $serverid;
+ $this->boqmailldap->save($values);
+ if ($bo_action' == 'save_ldap')
{
$this->listServers();
}
else
{
-
$this->editServer($_GET['serverid'],$_GET['pagenumber']);
+ $this->editServer($serverid,$pagenumber);
}
}
====================================================
Index: qmailldap/inc/class.boqmailldap.inc.php
diff -u qmailldap/inc/class.boqmailldap.inc.php:1.13.4.2
qmailldap/inc/class.boqmailldap.inc.php:1.13.4.3
--- qmailldap/inc/class.boqmailldap.inc.php:1.13.4.2 Mon Feb 28 19:11:57 2005
+++ qmailldap/inc/class.boqmailldap.inc.php Wed Mar 2 16:14:11 2005
@@ -105,17 +105,13 @@
#print "restored Session<br>";
}
- function save($_postVars, $_getVars)
+ function save($values)
{
- $serverid = $_getVars['serverid'];
-
- if (isset($_postVars['bo_action']))
- {
- $bo_action = $_postVars['bo_action'];
- }
- elseif (isset($_getVars['bo_action']))
+ $serverid = $values['serverid'];
+
+ if (isset($values['bo_action']))
{
- $bo_action = $_getVars['bo_action'];
+ $bo_action = $values['bo_action'];
}
else
{
@@ -128,18 +124,18 @@
{
case 'add_locals':
$count =
count($this->sessionData[$serverid]['locals']);
-
$this->sessionData[$serverid]['locals'][$count] = $_postVars['new_local'];
+
$this->sessionData[$serverid]['locals'][$count] = $values['new_local'];
$this->sessionData[$serverid]['needActivation'] = 1;
$this->saveSessionData();
break;
case 'add_rcpthosts':
$count =
count($this->sessionData[$serverid]['rcpthosts']);
-
$this->sessionData[$serverid]['rcpthosts'][$count] = $_postVars['new_rcpthost'];
- if ($_postVars['add_to_local'] == 'on')
+
$this->sessionData[$serverid]['rcpthosts'][$count] = $values['new_rcpthost'];
+ if ($values['add_to_local'] == 'on')
{
$count =
count($this->sessionData[$serverid]['locals']);
-
$this->sessionData[$serverid]['locals'][$count] = $_postVars['new_rcpthost'];
+
$this->sessionData[$serverid]['locals'][$count] = $values['new_rcpthost'];
}
$this->sessionData[$serverid]['needActivation'] = 1;
$this->saveSessionData();
@@ -149,9 +145,9 @@
$this->sessionData[$serverid]['smtproutes'][$count] =
sprintf("%s:%s:%s",
-
$_postVars['domain_name'],
-
$_postVars['remote_server'],
-
$_postVars['remote_port']
+ $values['domain_name'],
+
$values['remote_server'],
+ $values['remote_port']
);
$this->sessionData[$serverid]['needActivation'] = 1;
$this->saveSessionData();
@@ -162,7 +158,7 @@
while(list($key, $value) =
each($this->sessionData[$serverid]['locals']))
{
#print ".. $key: $value<br>";
- if ($key !=
$_postVars['locals'])
+ if ($key != $values['locals'])
{
$newLocals[$i]=$value;
#print "!! $i:
$value<br>";
@@ -179,7 +175,7 @@
while(list($key, $value) =
each($this->sessionData[$serverid]['rcpthosts']))
{
#print ".. $key: $value<br>";
- if ($key !=
$_postVars['rcpthosts'])
+ if ($key !=
$values['rcpthosts'])
{
$newRcpthosts[$i]=$value;
#print "!! $i:
$value<br>";
@@ -196,7 +192,7 @@
while(list($key, $value) =
each($this->sessionData[$serverid]['smtproutes']))
{
#print ".. $key: $value :
".$_getVars["smtproute_id"]."<br>";
- if ($key !=
$_getVars['smtproute_id'])
+ if ($key !=
$values['smtproute_id'])
{
$newSmtproutes[$i]=$value;
#print "!! $i:
$value<br>";
@@ -211,12 +207,12 @@
#print "hallo".$_getVars["serverid"]."
".$_postVars["servername"]."<br>";
$data = array
(
- 'qmail_servername' =>
$_postVars['qmail_servername'],
- 'description' =>
$_postVars['description'],
- 'ldap_basedn' =>
$_postVars['ldap_basedn'],
- 'id'
=> $_getVars['serverid']
+ 'qmail_servername' =>
$values['qmail_servername'],
+ 'description' =>
$values['description'],
+ 'ldap_basedn' =>
$values['ldap_basedn'],
+ 'id'
=> $values['serverid']
);
- if (!isset($_getVars['serverid']))
+ if (!isset($values['serverid']))
{
$this->soqmailldap->update('add_server',$data);
}
@@ -224,7 +220,7 @@
{
$this->soqmailldap->update('update_server',$data);
}
-
$this->getLDAPData($_getVars['serverid'],'1');
+
$this->getLDAPData($values['serverid'],'1');
break;
case 'write_to_ldap':
$this->soqmailldap->writeConfigData($this->sessionData[$serverid], $serverid);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] qmailldap/inc class.uiqmailldap.inc.php, 1.11.2.1.2.5 class.boqmailldap.inc.php, 1.13.4.3,
ceb <=