[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: qmailldap/inc class.boqmailldap.inc.php,1.15,1.1
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: qmailldap/inc class.boqmailldap.inc.php,1.15,1.16 class.uiqmailldap.inc.php,1.12,1.13 |
|
Date: |
Sat, 07 Dec 2002 22:22:41 -0500 |
Update of /cvsroot/phpgroupware/qmailldap/inc
In directory subversions:/tmp/cvs-serv20519/inc
Modified Files:
class.boqmailldap.inc.php class.uiqmailldap.inc.php
Log Message:
update
Index: class.boqmailldap.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/qmailldap/inc/class.boqmailldap.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.boqmailldap.inc.php 7 Dec 2002 02:54:43 -0000 1.15
--- class.boqmailldap.inc.php 8 Dec 2002 03:22:39 -0000 1.16
***************
*** 106,124 ****
}
! function save($_postVars, $_getVars)
{
! $serverid = $_getVars['serverid'];
! if (isset($_postVars["bo_action"]))
{
! $bo_action = $_postVars["bo_action"];
! }
! elseif (isset($_getVars["bo_action"]))
! {
! $bo_action = $_getVars["bo_action"];
}
else
{
! return false;
}
--- 106,120 ----
}
! function save($vars)
{
! $serverid = $vars['serverid'];
! if (isset($vars['bo_action']))
{
! $bo_action = $vars['bo_action'];
}
else
{
! return False;
}
***************
*** 130,135 ****
$count =
count($this->sessionData[$serverid]['locals']);
!
$this->sessionData[$serverid]['locals'][$count] =
! $_postVars['new_local'];
$this->sessionData[$serverid]['needActivation'] = 1;
--- 126,130 ----
$count =
count($this->sessionData[$serverid]['locals']);
!
$this->sessionData[$serverid]['locals'][$count] = $vars['new_local'];
$this->sessionData[$serverid]['needActivation'] = 1;
***************
*** 138,148 ****
case 'add_rcpthosts':
$count =
count($this->sessionData[$serverid]['rcpthosts']);
!
$this->sessionData[$serverid]['rcpthosts'][$count] = $_postVars['new_rcpthost'];
! if ($_postVars['add_to_local'] == 'on')
{
$count =
count($this->sessionData[$serverid]['locals']);
!
!
$this->sessionData[$serverid]['locals'][$count] =
!
$_postVars["new_rcpthost"];
}
$this->sessionData[$serverid]['needActivation'] = 1;
--- 133,141 ----
case 'add_rcpthosts':
$count =
count($this->sessionData[$serverid]['rcpthosts']);
!
$this->sessionData[$serverid]['rcpthosts'][$count] = $vars['new_rcpthost'];
! if ($vars['add_to_local'] == 'on')
{
$count =
count($this->sessionData[$serverid]['locals']);
!
$this->sessionData[$serverid]['locals'][$count] = $vars['new_rcpthost'];
}
$this->sessionData[$serverid]['needActivation'] = 1;
***************
*** 152,158 ****
$count =
count($this->sessionData[$serverid]['smtproutes']);
$this->sessionData[$serverid]['smtproutes'][$count] = sprintf("%s:%s:%s",
!
$_postVars['domain_name'],
!
$_postVars['remote_server'],
!
$_postVars['remote_port']);
$this->sessionData[$serverid]['needActivation'] = 1;
$this->saveSessionData();
--- 145,151 ----
$count =
count($this->sessionData[$serverid]['smtproutes']);
$this->sessionData[$serverid]['smtproutes'][$count] = sprintf("%s:%s:%s",
!
$vars['domain_name'],
!
$vars['remote_server'],
!
$vars['remote_port']);
$this->sessionData[$serverid]['needActivation'] = 1;
$this->saveSessionData();
***************
*** 163,167 ****
{
#print ".. $key: $value<br>";
! if ($key !=
$_postVars['locals'])
{
$newLocals[$i]=$value;
--- 156,160 ----
{
#print ".. $key: $value<br>";
! if ($key != $vars['locals'])
{
$newLocals[$i]=$value;
***************
*** 179,183 ****
{
#print ".. $key: $value<br>";
! if ($key !=
$_postVars['rcpthosts'])
{
$newRcpthosts[$i]=$value;
--- 172,176 ----
{
#print ".. $key: $value<br>";
! if ($key != $vars['rcpthosts'])
{
$newRcpthosts[$i]=$value;
***************
*** 195,199 ****
{
#print ".. $key: $value :
".$_getVars["smtproute_id"]."<br>";
! if ($key !=
$_getVars['smtproute_id'])
{
$newSmtproutes[$i]=$value;
--- 188,192 ----
{
#print ".. $key: $value :
".$_getVars["smtproute_id"]."<br>";
! if ($key !=
$vars['smtproute_id'])
{
$newSmtproutes[$i]=$value;
***************
*** 210,217 ****
$data = array
(
! 'qmail_servername' =>
$_postVars['qmail_servername'],
! 'description' =>
$_postVars['description'],
! 'ldap_basedn' =>
$_postVars['ldap_basedn'],
! 'id'
=> $_getVars['serverid']
);
if (!isset($_getVars['serverid']))
--- 203,210 ----
$data = array
(
! 'qmail_servername' =>
$vars['qmail_servername'],
! 'description' =>
$vars['description'],
! 'ldap_basedn' =>
$vars['ldap_basedn'],
! 'id'
=> $vars['serverid']
);
if (!isset($_getVars['serverid']))
***************
*** 223,227 ****
$this->soqmailldap->update('update_server',$data);
}
!
$this->getLDAPData($_getVars['serverid'], '1');
break;
case 'write_to_ldap':
--- 216,220 ----
$this->soqmailldap->update('update_server',$data);
}
! $this->getLDAPData($vars['serverid'],
'1');
break;
case 'write_to_ldap':
Index: class.uiqmailldap.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/qmailldap/inc/class.uiqmailldap.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uiqmailldap.inc.php 7 Dec 2002 02:54:43 -0000 1.12
--- class.uiqmailldap.inc.php 8 Dec 2002 03:22:39 -0000 1.13
***************
*** 54,57 ****
--- 54,63 ----
$GLOBALS['phpgw']->template->set_var('done_link',$GLOBALS['phpgw']->link('/index.php',$linkData));
+
$GLOBALS['phpgw']->template->set_var('qmail_servername',$values['qmail_servername']);
+
$GLOBALS['phpgw']->template->set_var('description',$values['description']);
+
$GLOBALS['phpgw']->template->set_var('ldap_basedn',$values['ldap_basedn']);
+
$GLOBALS['phpgw']->template->set_var('ldap_basedn',$values['ldap_basedn']);
+
+
$linkData = array
(
***************
*** 59,64 ****
);
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php',$linkData));
! $GLOBALS['phpgw']->template->parse('out','main');
! print $GLOBALS['phpgw']->template->get('out','main');
}
--- 65,73 ----
);
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php',$linkData));
!
! $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array
! (
! 'body_data' =>
$GLOBALS['phpgw']->template->parse('out','main')
! ));
}
***************
*** 153,160 ****
$serverid =
get_var('serverid',array('GET'));
$pagenumber =
get_var('pagenumber',array('GET'));
! $HTTP_GET_VARS =
get_var('HTTP_GET_VARS',array('GET'));;
! if(!empty($_serverid)) $serverid=$_serverid;
! if(!empty($_pagenumber)) $pagenumber=$_pagenumber;
$ldapData = $this->boqmailldap->getLDAPData($serverid);
--- 162,175 ----
$serverid =
get_var('serverid',array('GET'));
$pagenumber =
get_var('pagenumber',array('GET'));
! //$values =
get_var('values',array('GET'));;
! if(!empty($_serverid))
! {
! $serverid=$_serverid;
! }
! if(!empty($_pagenumber))
! {
! $pagenumber=$_pagenumber;
! }
$ldapData = $this->boqmailldap->getLDAPData($serverid);
***************
*** 259,264 ****
}
! $GLOBALS['phpgw']->template->parse('out','main');
! print $GLOBALS['phpgw']->template->get('out','main');
}
--- 274,281 ----
}
! $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array
! (
! 'body_data' =>
$GLOBALS['phpgw']->template->parse('out','main')
! ));
}
***************
*** 301,306 ****
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php',$linkData));
! $GLOBALS['phpgw']->template->parse('out','main');
! print $GLOBALS['phpgw']->template->get('out','main');
}
--- 318,325 ----
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php',$linkData));
! $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array
! (
! 'body_data' =>
$GLOBALS['phpgw']->template->parse('out','main')
! ));
}
***************
*** 310,318 ****
$GLOBALS['phpgw']->template->set_block('body','main','main');
$GLOBALS['phpgw']->template->set_block('body','row','row');
!
$this->translate();
$serverList = $this->boqmailldap->getServerList();
! if ($serverList)
{
for ($i=0; $i < count($serverList); $i++)
--- 329,337 ----
$GLOBALS['phpgw']->template->set_block('body','main','main');
$GLOBALS['phpgw']->template->set_block('body','row','row');
!
$this->translate();
$serverList = $this->boqmailldap->getServerList();
! if (is_array($serverList))
{
for ($i=0; $i < count($serverList); $i++)
***************
*** 341,347 ****
);
$GLOBALS['phpgw']->template->set_var('delete_link',$GLOBALS['phpgw']->link('/index.php',$linkData));
!
$GLOBALS['phpgw']->template->parse('rows','row',True);
}
}
$linkData = array
--- 360,370 ----
);
$GLOBALS['phpgw']->template->set_var('delete_link',$GLOBALS['phpgw']->link('/index.php',$linkData));
!
$GLOBALS['phpgw']->template->parse('rows','row');
}
}
+ else
+ {
+ $GLOBALS['phpgw']->template->set_var('rows','');
+ }
$linkData = array
***************
*** 350,361 ****
);
$GLOBALS['phpgw']->template->set_var('add_link',$GLOBALS['phpgw']->link('/index.php',$linkData));
! $GLOBALS['phpgw']->template->parse('out','main');
! print $GLOBALS['phpgw']->template->get('out','main');
}
function save()
{
! $this->boqmailldap->save($GLOBALS['HTTP_POST_VARS'],
$GLOBALS['HTTP_GET_VARS']);
! if ($GLOBALS['HTTP_POST_VARS']['bo_action'] ==
'save_ldap' || $GLOBALS['HTTP_GET_VARS']['bo_action'] == 'save_ldap')
{
$this->listServers();
--- 373,388 ----
);
$GLOBALS['phpgw']->template->set_var('add_link',$GLOBALS['phpgw']->link('/index.php',$linkData));
! $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array
! (
! 'body_data' =>
$GLOBALS['phpgw']->template->parse('out','main')
! ));
}
function save()
{
! $values = get_var('values',array('POST','GET'));
!
! $this->boqmailldap->save($values);
! if ($values['bo_action'] == 'save_ldap')
{
$this->listServers();
***************
*** 363,370 ****
else
{
!
$this->editServer($GLOBALS['HTTP_GET_VARS']['serverid'],$GLOBALS['HTTP_GET_VARS']['pagenumber']);
}
}
!
function translate()
{
--- 390,397 ----
else
{
!
$this->editServer($values['serverid'],$values['pagenumber']);
}
}
!
function translate()
{
***************
*** 384,388 ****
$GLOBALS['phpgw']->template->set_var('lang_add_to_local',lang('add also to
local domains'));
$GLOBALS['phpgw']->template->set_var('lang_ldap_server',lang('LDAP server'));
!
$GLOBALS['phpgw']->template->set_var('lang_ldap_basedn',lang('LDAP basedn'));
$GLOBALS['phpgw']->template->set_var('lang_ldap_server_admin',lang('admin dn'));
$GLOBALS['phpgw']->template->set_var('lang_ldap_server_password',lang('admin
password'));
--- 411,415 ----
$GLOBALS['phpgw']->template->set_var('lang_add_to_local',lang('add also to
local domains'));
$GLOBALS['phpgw']->template->set_var('lang_ldap_server',lang('LDAP server'));
!
$GLOBALS['phpgw']->template->set_var('lang_qmail_base',lang('qmail dn'));
$GLOBALS['phpgw']->template->set_var('lang_ldap_server_admin',lang('admin dn'));
$GLOBALS['phpgw']->template->set_var('lang_ldap_server_password',lang('admin
password'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: qmailldap/inc class.boqmailldap.inc.php,1.15,1.16 class.uiqmailldap.inc.php,1.12,1.13,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: qmailldap/setup phpgw_de.lang,1.10,1.11 phpgw_en.lang,1.3,1.4
- Next by Date:
[Phpgroupware-cvs] CVS: fax/templates/default cover_preview.tpl,1.2,1.3 preferences.tpl,1.2,1.3 sendfax.tpl,1.5,1.6
- Previous by thread:
[Phpgroupware-cvs] CVS: qmailldap/setup phpgw_de.lang,1.10,1.11 phpgw_en.lang,1.3,1.4
- Next by thread:
[Phpgroupware-cvs] CVS: fax/templates/default cover_preview.tpl,1.2,1.3 preferences.tpl,1.2,1.3 sendfax.tpl,1.5,1.6
- Index(es):