[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.16,1.1
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: qmailldap/inc class.boqmailldap.inc.php,1.16,1.17 class.soqmailldap.inc.php,1.16,1.17class.uiqmailldap.inc.php,1.13,1.14 |
|
Date: |
Wed, 11 Dec 2002 19:05:13 -0500 |
Update of /cvsroot/phpgroupware/qmailldap/inc
In directory subversions:/tmp/cvs-serv21109/inc
Modified Files:
class.boqmailldap.inc.php class.soqmailldap.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.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.boqmailldap.inc.php 8 Dec 2002 03:22:39 -0000 1.16
--- class.boqmailldap.inc.php 12 Dec 2002 00:05:11 -0000 1.17
***************
*** 23,28 ****
'getLocals' => True,
'getRcptHosts' => True,
! 'getLDAPStorageData' => True,
! 'abcdefgh' => True
);
--- 23,27 ----
'getLocals' => True,
'getRcptHosts' => True,
! 'getLDAPStorageData' => True
);
***************
*** 205,212 ****
'qmail_servername' =>
$vars['qmail_servername'],
'description' =>
$vars['description'],
! 'ldap_basedn' =>
$vars['ldap_basedn'],
'id'
=> $vars['serverid']
);
! if (!isset($_getVars['serverid']))
{
$this->soqmailldap->update('add_server',$data);
--- 204,213 ----
'qmail_servername' =>
$vars['qmail_servername'],
'description' =>
$vars['description'],
! 'qmail_dn'
=> $vars['qmail_dn'],
! 'dirmaker'
=> $vars['dirmaker'],
'id'
=> $vars['serverid']
);
!
! if (!isset($vars['serverid']))
{
$this->soqmailldap->update('add_server',$data);
Index: class.soqmailldap.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/qmailldap/inc/class.soqmailldap.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.soqmailldap.inc.php 11 Dec 2002 14:18:01 -0000 1.16
--- class.soqmailldap.inc.php 12 Dec 2002 00:05:11 -0000 1.17
***************
*** 52,57 ****
$storageData['qmail_servername'] =
$this->db->f('qmail_servername');
$storageData['description'] =
$this->db->f('description');
! $storageData['ldap_basedn'] =
$this->db->f('ldap_basedn');
!
return $storageData;
}
--- 52,57 ----
$storageData['qmail_servername'] =
$this->db->f('qmail_servername');
$storageData['description'] =
$this->db->f('description');
! $storageData['qmail_dn']
= $this->db->f('qmail_dn');
!
return $storageData;
}
***************
*** 61,65 ****
}
}
!
function getLDAPData($_serverid)
{
--- 61,65 ----
}
}
!
function getLDAPData($_serverid)
{
***************
*** 68,76 ****
$filter = "cn=".$storageData['qmail_servername'];
! $sri =
@ldap_read($this->ldap,$storageData['ldap_basedn'],$filter);
if ($sri)
{
! $allValues = ldap_get_entries($ldap, $sri);
!
unset($allValues[0]['rcpthosts']['count']);
unset($allValues[0]['locals']['count']);
--- 68,76 ----
$filter = "cn=".$storageData['qmail_servername'];
! $sri =
@ldap_read($this->ldap,$storageData['qmail_dn'],$filter);
if ($sri)
{
! $allValues = ldap_get_entries($this->ldap,
$sri);
!
unset($allValues[0]['rcpthosts']['count']);
unset($allValues[0]['locals']['count']);
***************
*** 81,88 ****
'rcpthosts' =>
$allValues[0]['rcpthosts'],
'locals' =>
$allValues[0]['locals'],
! 'smtproutes' =>
$allValues[0]['smtproutes'],
! 'ldapbasedn' =>
$allValues[0]['ldapbasedn'][0]
);
!
#$data['smtproutes'] = array
#(
--- 81,87 ----
'rcpthosts' =>
$allValues[0]['rcpthosts'],
'locals' =>
$allValues[0]['locals'],
! 'smtproutes' =>
$allValues[0]['smtproutes']
);
!
#$data['smtproutes'] = array
#(
***************
*** 90,94 ****
# '1' =>
't-dialin.net:smtprelay.t-online.de:25'
#);
!
if
(isset($allValues[0]['ldaplocaldelivery'][0]))
{
--- 89,93 ----
# '1' =>
't-dialin.net:smtprelay.t-online.de:25'
#);
!
if
(isset($allValues[0]['ldaplocaldelivery'][0]))
{
***************
*** 111,114 ****
--- 110,117 ----
}
+ if (isset($allValues[0]['dirmaker'][0]))
+ {
+ $data['dirmaker'] =
$allValues[0]['dirmaker'][0];
+ }
return $data;
}
***************
*** 250,263 ****
{
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']);
$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'",
$_data['description'],
! $_data['ldap_basedn'],
$_data['qmail_servername'],
$_data['id']);
--- 253,266 ----
{
case 'add_server':
! $query = sprintf("insert into
phpgw_qmailldap (description, qmail_dn, qmail_servername) values
('%s','%s','%s')",
$_data['description'],
! $_data['qmail_dn'],
$_data['qmail_servername']);
$this->db->query($query);
break;
case 'update_server':
! $query = sprintf("update
phpgw_qmailldap set description='%s',qmail_dn='%s',qmail_servername='%s' where
id='%s'",
$_data['description'],
! $_data['qmail_dn'],
$_data['qmail_servername'],
$_data['id']);
***************
*** 270,284 ****
{
$storageData = $this->getLDAPStorageData($_serverid);
!
#print "write Data for
".$storageData['qmail_servername']."<br>";
!
// check if the DN exists, if not create it
$filter = "objectclass=*";
! @ldap_read($this->ldap,$storageData['ldap_basedn'],
$filter);
if (ldap_errno($ds) == 32)
{
$ldapData['objectclass'][0] =
'qmailcontrol';
$ldapData['cn'] =
$storageData['qmail_servername'];
!
ldap_add($ds,$storageData['ldap_basedn'],$ldapData);
}
--- 273,287 ----
{
$storageData = $this->getLDAPStorageData($_serverid);
!
#print "write Data for
".$storageData['qmail_servername']."<br>";
!
// check if the DN exists, if not create it
$filter = "objectclass=*";
! @ldap_read($this->ldap,$storageData['qmail_dn'],
$filter);
if (ldap_errno($ds) == 32)
{
$ldapData['objectclass'][0] =
'qmailcontrol';
$ldapData['cn'] =
$storageData['qmail_servername'];
!
ldap_add($this->ldap,$storageData['qmail_dn'],$ldapData);
}
***************
*** 287,291 ****
$ldapData['smtproutes'] = $_data['smtproutes'];
!
ldap_modify($this->ldap,$storageData['ldap_basedn'],$ldapData);
}
}
--- 290,298 ----
$ldapData['smtproutes'] = $_data['smtproutes'];
! if (isset($_data['dirmaker']) &&
!empty($_data['dirmaker']))
! {
! $ldapData['dirMaker'] = $_data['dirmaker'];
! }
!
ldap_modify($this->ldap,$storageData['qmail_dn'],$ldapData);
}
}
Index: class.uiqmailldap.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/qmailldap/inc/class.uiqmailldap.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.uiqmailldap.inc.php 8 Dec 2002 03:22:39 -0000 1.13
--- class.uiqmailldap.inc.php 12 Dec 2002 00:05:11 -0000 1.14
***************
*** 56,61 ****
$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']);
--- 56,62 ----
$GLOBALS['phpgw']->template->set_var('qmail_servername',$values['qmail_servername']);
$GLOBALS['phpgw']->template->set_var('description',$values['description']);
!
$GLOBALS['phpgw']->template->set_var('qmail_dn',$values['qmail_dn']);
!
!
$GLOBALS['phpgw']->template->set_var('dirmaker',$values['dirmaker']);
***************
*** 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'));
--- 412,416 ----
$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_dn',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'));
***************
*** 418,422 ****
$GLOBALS['phpgw']->template->set_var('lang_remote_server',lang('remote
server'));
$GLOBALS['phpgw']->template->set_var('lang_remote_port',lang('remote port'));
!
$GLOBALS['phpgw']->template->set_var('desc_ldaplocaldelivery',lang('To lookup
the local passwd file if the LDAP lookup finds no match. This affects
qmail-lspawn and auth_* if the LDAP lookup returns nothing.'));
$GLOBALS['phpgw']->template->set_var('desc_ldapdefaultdotmode',lang('The
default interpretation of .qmail files.<br><b>Note:</b> Works only for
deliveries based on LDAP lookups. Local mails use dotonly like in normal
qmail.'));
--- 419,428 ----
$GLOBALS['phpgw']->template->set_var('lang_remote_server',lang('remote
server'));
$GLOBALS['phpgw']->template->set_var('lang_remote_port',lang('remote port'));
!
!
$GLOBALS['phpgw']->template->set_var('lang_qmail_settings',lang('qmail
settings'));
!
$GLOBALS['phpgw']->template->set_var('lang_ldap_base_settings',lang('ldap base
settings'));
!
$GLOBALS['phpgw']->template->set_var('lang_additional_settings_for_qmail',lang('additional
settings for qmail'));
!
$GLOBALS['phpgw']->template->set_var('lang_dirmaker_path',lang('absolute path
to dirmaker script | application'));
!
$GLOBALS['phpgw']->template->set_var('desc_ldaplocaldelivery',lang('To lookup
the local passwd file if the LDAP lookup finds no match. This affects
qmail-lspawn and auth_* if the LDAP lookup returns nothing.'));
$GLOBALS['phpgw']->template->set_var('desc_ldapdefaultdotmode',lang('The
default interpretation of .qmail files.<br><b>Note:</b> Works only for
deliveries based on LDAP lookups. Local mails use dotonly like in normal
qmail.'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: qmailldap/inc class.boqmailldap.inc.php,1.16,1.17 class.soqmailldap.inc.php,1.16,1.17class.uiqmailldap.inc.php,1.13,1.14,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default add_st_hours.tpl,1.2,NONE add_st_hours_list.tpl,1.2,NONE addressbook.tpl,1.2,NONE admin.tpl,1.1.1.1,NONE calculate_formhours.tpl,1.1.1.1,NONE calculate_listhours.tpl,1.1.1.1,NONE calculate_view.tpl,1.1.1.1,NONE config.tpl,1.6,NONE csv_invoice_import.tpl,1.1.1.1,NONE delete.tpl,1.1.1.1,NONE delete_common.tpl,1.1.1.1,NONE documentation_detail.tpl,1.1,NONE edit_calculate_formhours.tpl,1.1.1.1,NONE
- Next by Date:
[Phpgroupware-cvs] CVS: qmailldap/templates/default config.tpl,1.1,1.2 ldapsettings.tpl,1.4,1.5
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default add_st_hours.tpl,1.2,NONE add_st_hours_list.tpl,1.2,NONE addressbook.tpl,1.2,NONE admin.tpl,1.1.1.1,NONE calculate_formhours.tpl,1.1.1.1,NONE calculate_listhours.tpl,1.1.1.1,NONE calculate_view.tpl,1.1.1.1,NONE config.tpl,1.6,NONE csv_invoice_import.tpl,1.1.1.1,NONE delete.tpl,1.1.1.1,NONE delete_common.tpl,1.1.1.1,NONE documentation_detail.tpl,1.1,NONE edit_calculate_formhours.tpl,1.1.1.1,NONE
- Next by thread:
[Phpgroupware-cvs] CVS: qmailldap/templates/default config.tpl,1.1,1.2 ldapsettings.tpl,1.4,1.5
- Index(es):