Author: varkoly
Date: Thu Jul 24 11:34:00 2008
New Revision: 49378
URL: http://svn.opensuse.org/viewcvs/yast?rev=49378&view=rev
Log:
Applying patch from jsuchome because of API changes
Modified:
trunk/mail/src/MailServer.ycp
trunk/mail/src/YaPI/MailServer.pm
trunk/mail/users-plugin/UsersPluginMail.pm
trunk/mail/users-plugin/users_plugin_mail.ycp
trunk/mail/users-plugin/users_plugin_mail_groups.ycp
Modified: trunk/mail/src/MailServer.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/MailServer.ycp?rev=49378&r1=49377&r2=49378&view=diff
==============================================================================
--- trunk/mail/src/MailServer.ycp (original)
+++ trunk/mail/src/MailServer.ycp Thu Jul 24 11:34:00 2008
@@ -184,17 +184,17 @@
/* looking if a mail domain exist */
map searchmap = $[
"base_dn" : LDAPSettings["base_config_dn"]:"",
- "filter" : "objectclass=suseDnsConfiguration",
+ "filter" : "objectClass=suseDnsConfiguration",
"attrs" : ["suseDefaultBase"],
"not_found_ok": false,
"scope" : 2
];
list modulesDns = (list)SCR::Read (.ldap.search, searchmap);
- string dns_base = (string)modulesDns[0,"susedefaultbase",0]:"";
+ string dns_base = (string)modulesDns[0,"suseDefaultBase",0]:"";
searchmap = $[
"base_dn" : dns_base,
- "filter" : "(&(objectclass=dNSZone)(relativeDomainName=@))",
+ "filter" : "(&(objectClass=dNSZone)(relativeDomainName=@))",
"not_found_ok" : false,
"map" : true,
"scope" : 2
@@ -209,7 +209,7 @@
}
boolean is_main_domain = false;
foreach(string dn, map domain, (map) domains, ``{
- if(domain["susemaildomaintype",0]:"" == "main" )
+ if(domain["suseMailDomainType",0]:"" == "main" )
{
is_main_domain = true;
break;
@@ -230,7 +230,7 @@
|| substring (((list)domain["zonename"]:[])[0]:"",
size (((list)domain["zonename"]:[])[0]:"") - size (".in-addr.arpa")) != ".in-addr.arpa")
{
- domain["objectclass"] = add(domain["objectclass"]:[], "suseMailDomain");
+ domain["objectClass"] = add(domain["objectClass"]:[], "suseMailDomain");
domain["suseMailDomainType"] = ["main"];
domain["suseMailDomainMasquerading"] = ["yes"];
lastDomain = domain;
Modified: trunk/mail/src/YaPI/MailServer.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/YaPI/MailServer.pm?rev=49378&r1=49377&r2=49378&view=diff
==============================================================================
--- trunk/mail/src/YaPI/MailServer.pm (original)
+++ trunk/mail/src/YaPI/MailServer.pm Thu Jul 24 11:34:00 2008
@@ -463,7 +463,7 @@
my %SearchMap = (
'base_dn' => $ldapMap->{'mail_config_dn'},
- 'filter' => "ObjectClass=suseCanonicalTable",
+ 'filter' => "objectClass=suseCanonicalTable",
'scope' => 2,
'map' => 1,
'attributes' => ['tableKey',
@@ -480,9 +480,9 @@
foreach my $dn (keys %{$ret})
{
my $Canonical = {};
- $Canonical->{'key'} = $ret->{$dn}->{'tablekey'}->[0];
- $Canonical->{'value'} = $ret->{$dn}->{'tablevalue'}->[0];
- $Canonical->{'type'} = $ret->{$dn}->{'valuetype'}->[0];
+ $Canonical->{'key'} = $ret->{$dn}->{'tableKey'}->[0];
+ $Canonical->{'value'} = $ret->{$dn}->{'tableValue'}->[0];
+ $Canonical->{'type'} = $ret->{$dn}->{'valueType'}->[0];
if( defined $ret->{$dn}->{'description'}->[0] )
{
$Canonical->{'description'} = $ret->{$dn}->{'description'}->[0];
@@ -665,7 +665,7 @@
my %SearchMap = (
'base_dn' => $ldapMap->{'mail_config_dn'},
- 'filter' => "ObjectClass=suseMailTransport",
+ 'filter' => "objectClass=suseMailTransport",
'scope' => 2,
'map' => 1,
'attributes' => ['suseMailTransportDestination',
@@ -680,14 +680,14 @@
foreach my $dn (keys %{$ret})
{
my $Transport = {};
- $Transport->{'Destination'} = $ret->{$dn}->{'susemailtransportdestination'}->[0];
- if( $ret->{$dn}->{'susemailtransportnexthop'}->[0] =~ /:/)
+ $Transport->{'Destination'} = $ret->{$dn}->{'suseMailTransportDestination'}->[0];
+ if( $ret->{$dn}->{'suseMailTransportNexthop'}->[0] =~ /:/)
{
- ($Transport->{'Transport'},$Transport->{'Nexthop'}) = split /:/,$ret->{$dn}->{'susemailtransportnexthop'}->[0];
+ ($Transport->{'Transport'},$Transport->{'Nexthop'}) = split /:/,$ret->{$dn}->{'suseMailTransportNexthop'}->[0];
}
else
{
- $Transport->{'Nexthop'} = $ret->{$dn}->{'susemailtransportnexthop'}->[0];
+ $Transport->{'Nexthop'} = $ret->{$dn}->{'suseMailTransportNexthop'}->[0];
}
push @{$MailTransports{'Transports'}}, $Transport;
if( $Transport->{'Nexthop'} =~ /\[(.*)\]/ )
@@ -728,8 +728,8 @@
# filling up our array
foreach my $dn (keys %{$ret})
{
- my $TLSMode = $ret->{$dn}->{'susetlspersitemode'}->[0] || "NONE";
- my $TLSSite = $ret->{$dn}->{'susetlspersitepeer'}->[0] ;
+ my $TLSMode = $ret->{$dn}->{'suseTLSPerSiteMode'}->[0] || "NONE";
+ my $TLSSite = $ret->{$dn}->{'suseTLSPerSitePeer'}->[0] ;
$MailTransports{'TLSSites'}->{$TLSSite} = $TLSMode;
}
@@ -820,10 +820,10 @@
# Search hash to find all the Transport Objects
my %SearchMap = (
'base_dn' => $ldapMap->{'mail_config_dn'},
- 'filter' => "objectclass=susemailtransport",
+ 'filter' => "objectClass=suseMailTransport",
'map' => 1,
'scope' => 2,
- 'attrs' => ['susemailtransportdestination' ]
+ 'attrs' => ['suseMailTransportDestination' ]
);
my $ret = SCR->Read('.ldap.search',\%SearchMap);
@@ -932,7 +932,7 @@
# Search hash to find all the TLSSites Objects
%SearchMap = (
'base_dn' => $ldapMap->{'mail_config_dn'},
- 'filter' => "objectclass=suseTLSPerSiteContainer",
+ 'filter' => "objectClass=suseTLSPerSiteContainer",
'map' => 1,
'scope' => 2,
'attrs' => []
@@ -1152,8 +1152,8 @@
foreach my $entry (@{$ret})
{
my $AccessEntry = {};
- $AccessEntry->{'MailClient'} = $entry->{'susemailclient'}->[0];
- $AccessEntry->{'MailAction'} = $entry->{'susemailaction'}->[0];
+ $AccessEntry->{'MailClient'} = $entry->{'suseMailClient'}->[0];
+ $AccessEntry->{'MailAction'} = $entry->{'suseMailAction'}->[0];
push @{$MailPrevention{'AccessList'}}, $AccessEntry;
}
@@ -1297,7 +1297,7 @@
#Now we have a look on the access table
my %SearchMap = (
'base_dn' => $ldapMap->{'mail_config_dn'},
- 'filter' => "ObjectClass=suseMailAccess",
+ 'filter' => "objectClass=suseMailAccess",
'scope' => 2,
'map' => 1
);
@@ -2123,11 +2123,11 @@
foreach(@{$ret})
{
my $domain = {};
- if( $_->{'zonename'}->[0] !~ /in-addr.arpa$/i)
+ if( $_->{'zoneName'}->[0] !~ /in-addr.arpa$/i)
{
- $domain->{'Name'} = $_->{'zonename'}->[0];
- $domain->{'Type'} = $_->{'susemaildomaintype'}->[0] || 'none';
- $domain->{'Masquerading'} = $_->{'susemaildomainmasquerading'}->[0] || 'yes';
+ $domain->{'Name'} = $_->{'zoneName'}->[0];
+ $domain->{'Type'} = $_->{'suseMailDomainType'}->[0] || 'none';
+ $domain->{'Masquerading'} = $_->{'suseMailDomainMasquerading'}->[0] || 'yes';
push @{$MailLocalDomains{'Domains'}}, $domain;
}
}
@@ -2178,15 +2178,15 @@
my $DN = "zoneName=$name,$ldapMap->{'dns_config_dn'}";
my $retVal = SCR->Read('.ldap.search',{
"base_dn" => $DN,
- "filter" => '(objectclass=dNSZone)',
+ "filter" => '(objectClass=dNSZone)',
"scope" => 0,
"not_found_ok" => 0
} );
- if( defined $retVal && defined $retVal->[0] && defined $retVal->[0]->{'objectclass'})
+ if( defined $retVal && defined $retVal->[0] && defined $retVal->[0]->{'objectClass'})
{
my $found = 0;
- foreach my $ojc ( @{$retVal->[0]->{'objectclass'}} )
+ foreach my $ojc ( @{$retVal->[0]->{'objectClass'}} )
{
if($ojc =~ /^suseMailDomain$/i) {
$found = 1;
@@ -2195,9 +2195,9 @@
}
if($found && $type eq 'none')
{
- # delete objectclass
+ # delete objectClass
- $Domains->{$DN}->{'objectclass'} = ['dNSZone'];
+ $Domains->{$DN}->{'objectClass'} = ['dNSZone'];
$Domains->{$DN}->{'suseMailDomainType'} = [];
$Domains->{$DN}->{'suseMailDomainMasquerading'} = [];
@@ -2219,7 +2219,7 @@
{
# modify
- $Domains->{$DN}->{'objectclass'} = ['dNSZone','suseMailDomain'];
+ $Domains->{$DN}->{'objectClass'} = ['dNSZone','suseMailDomain'];
$Domains->{$DN}->{'zoneName'} = $name;
$Domains->{$DN}->{'suseMailDomainType'} = $type;
$Domains->{$DN}->{'suseMailDomainMasquerading'} = $masquerading;
@@ -2351,7 +2351,7 @@
# read mail configuration data
$ldapret = SCR->Read(".ldap.search", {
"base_dn" => $ldapMap->{'base_config_dn'},
- "filter" => '(objectclass=suseMailConfiguration)',
+ "filter" => '(objectClass=suseMailConfiguration)',
"scope" => 2,
"not_found_ok" => 1,
"attrs" => [ 'suseDefaultBase' ]
@@ -2365,7 +2365,7 @@
}
if(@$ldapret > 0)
{
- $ldapMap->{'mail_config_dn'} = $ldapret->[0]->{'susedefaultbase'}->[0];
+ $ldapMap->{'mail_config_dn'} = $ldapret->[0]->{'suseDefaultBase'}->[0];
}
else
{
@@ -2405,7 +2405,7 @@
# check whether ou=Mailserver tree exists
$ldapret = SCR->Read(".ldap.search", {
"base_dn" => $ldapMap->{'ldap_domain'},
- "filter" => '(&(ou=Mailserver)(objectclass=organizationalUnit))',
+ "filter" => '(&(ou=Mailserver)(objectClass=organizationalUnit))',
"scope" => 2,
"not_found_ok" => 1,
"attrs" => [ 'ou' ]
@@ -2447,7 +2447,7 @@
# check whether mail plugin is already in the pluginlist
$ldapret = SCR->Read(".ldap.search", {
"base_dn" => $ldapMap->{'base_config_dn'},
- "filter" => '(objectclass=suseUserTemplate)',
+ "filter" => '(objectClass=suseUserTemplate)',
"scope" => 2,
"not_found_ok" => 1
});
@@ -2462,9 +2462,9 @@
{
#
my $foundplugin = 0;
- if( defined $ldapret->[0]->{'suseplugin'} )
+ if( defined $ldapret->[0]->{'susePlugin'} )
{
- foreach my $sp ( @{$ldapret->[0]->{'suseplugin'}} )
+ foreach my $sp ( @{$ldapret->[0]->{'susePlugin'}} )
{
$foundplugin = 1 if lc($sp) eq "userspluginmail";
}
@@ -2479,7 +2479,7 @@
description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'});
}
my $dn = "cn=userTemplate,".$ldapMap->{'base_config_dn'};
- my $pluginlist = $ldapret->[0]->{'suseplugin'};
+ my $pluginlist = $ldapret->[0]->{'susePlugin'};
push @$pluginlist, 'UsersPluginMail';
if( ! SCR->Write('.ldap.modify',
{ "dn" => $dn },
@@ -2503,7 +2503,7 @@
# now we search user base
$ldapret = SCR->Read(".ldap.search", {
"base_dn" => $ldapMap->{'base_config_dn'},
- "filter" => '(objectclass=suseUserConfiguration)',
+ "filter" => '(objectClass=suseUserConfiguration)',
"scope" => 2,
"not_found_ok" => 1,
"attrs" => [ 'suseDefaultBase' ]
@@ -2517,12 +2517,12 @@
}
if(@$ldapret > 0)
{
- $ldapMap->{'user_config_dn'} = $ldapret->[0]->{'susedefaultbase'}->[0];
+ $ldapMap->{'user_config_dn'} = $ldapret->[0]->{'suseDefaultBase'}->[0];
}
# now we search group base
$ldapret = SCR->Read(".ldap.search", {
"base_dn" => $ldapMap->{'base_config_dn'},
- "filter" => '(objectclass=suseGroupConfiguration)',
+ "filter" => '(objectClass=suseGroupConfiguration)',
"scope" => 2,
"not_found_ok" => 1,
"attrs" => [ 'suseDefaultBase' ]
@@ -2536,12 +2536,12 @@
}
if(@$ldapret > 0)
{
- $ldapMap->{'group_config_dn'} = $ldapret->[0]->{'susedefaultbase'}->[0];
+ $ldapMap->{'group_config_dn'} = $ldapret->[0]->{'suseDefaultBase'}->[0];
}
# now we search DNS base
$ldapret = SCR->Read(".ldap.search", {
"base_dn" => $ldapMap->{'base_config_dn'},
- "filter" => '(objectclass=suseDNSConfiguration)',
+ "filter" => '(objectClass=suseDNSConfiguration)',
"scope" => 2,
"not_found_ok" => 1,
"attrs" => [ 'suseDefaultBase' ]
@@ -2554,7 +2554,7 @@
code => "LDAP_SEARCH_FAILED");
}
if(@$ldapret > 0) {
- $ldapMap->{'dns_config_dn'} = $ldapret->[0]->{'susedefaultbase'}->[0];
+ $ldapMap->{'dns_config_dn'} = $ldapret->[0]->{'suseDefaultBase'}->[0];
}
else
{
@@ -2915,19 +2915,19 @@
my $changes = 0;
my %query_filter = (
- 'transport_maps' => '(&(objectclass=suseMailTransport)(suseMailTransportDestination=%s))',
- 'smtp_tls_per_site' => '(&(objectclass=suseMailTransport)(suseMailTransportDestination=%s))',
- 'access' => '(&(objectclass=suseMailAccess)(suseMailClient=%s))',
- 'local_recipient_maps'=> '(&(objectclass=suseMailRecipient)(|(suseMailAcceptAddress=%s)(uid=%s)))',
- 'alias_maps' => '(&(objectclass=suseMailRecipient)(cn=%s))',
- 'alias_maps_member' => '(&(objectclass=suseMailRecipient)(cn=%s)(suseDeliveryToMember=yes))',
- 'mynetworks' => '(&(objectclass=suseMailMyNetworks)(suseMailClient=%s))',
- 'masquerade_domains' => '(&(objectclass=suseMailDomain)(zoneName=%s)(suseMailDomainMasquerading=yes))',
- 'mydestination' => '(&(objectclass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(!(suseMailDomainType=virtual)))',
- 'virtual_alias_maps' => '(&(objectclass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(suseMailDomainType=virtual))',
- 'canonical_maps' => '(&(objectclass=suseCanonicalTable)(tableKey=%s)(valueType=both))',
- 'recipient_canonical_maps' => '(&(objectclass=suseCanonicalTable)(tableKey=%s)(valueType=recipient))',
- 'sender_canonical_maps' => '(&(objectclass=suseCanonicalTable)(tableKey=%s)(valueType=sender))'
+ 'transport_maps' => '(&(objectClass=suseMailTransport)(suseMailTransportDestination=%s))',
+ 'smtp_tls_per_site' => '(&(objectClass=suseMailTransport)(suseMailTransportDestination=%s))',
+ 'access' => '(&(objectClass=suseMailAccess)(suseMailClient=%s))',
+ 'local_recipient_maps'=> '(&(objectClass=suseMailRecipient)(|(suseMailAcceptAddress=%s)(uid=%s)))',
+ 'alias_maps' => '(&(objectClass=suseMailRecipient)(cn=%s))',
+ 'alias_maps_member' => '(&(objectClass=suseMailRecipient)(cn=%s)(suseDeliveryToMember=yes))',
+ 'mynetworks' => '(&(objectClass=suseMailMyNetworks)(suseMailClient=%s))',
+ 'masquerade_domains' => '(&(objectClass=suseMailDomain)(zoneName=%s)(suseMailDomainMasquerading=yes))',
+ 'mydestination' => '(&(objectClass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(!(suseMailDomainType=virtual)))',
+ 'virtual_alias_maps' => '(&(objectClass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(suseMailDomainType=virtual))',
+ 'canonical_maps' => '(&(objectClass=suseCanonicalTable)(tableKey=%s)(valueType=both))',
+ 'recipient_canonical_maps' => '(&(objectClass=suseCanonicalTable)(tableKey=%s)(valueType=recipient))',
+ 'sender_canonical_maps' => '(&(objectClass=suseCanonicalTable)(tableKey=%s)(valueType=sender))'
);
my %result_attribute = (
'transport_maps' => 'suseMailTransportNexthop',
Modified: trunk/mail/users-plugin/UsersPluginMail.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/users-plugin/UsersPluginMail.pm?rev=49378&r1=49377&r2=49378&view=diff
==============================================================================
--- trunk/mail/users-plugin/UsersPluginMail.pm (original)
+++ trunk/mail/users-plugin/UsersPluginMail.pm Thu Jul 24 11:34:00 2008
@@ -170,7 +170,7 @@
my $data = shift;
y2internal ("PluginPresent Mail called");
- if ( grep /^suseMailRecipient$/i, @{$data->{'objectclass'}} ) {
+ if ( grep /^suseMailRecipient$/i, @{$data->{'objectClass'}} ) {
y2milestone( "MailPlugin: Plugin Present");
return 1;
} else {
@@ -194,8 +194,8 @@
# attribute conversion
my @required_attrs = ();
my @object_classes = ();
- if (defined $data->{"objectclass"} && ref ($data->{"objectclass"}) eq "ARRAY") {
- @object_classes = @{$data->{"objectclass"}};
+ if (defined $data->{"objectClass"} && ref ($data->{"objectClass"}) eq "ARRAY") {
+ @object_classes = @{$data->{"objectClass"}};
}
# get the attributes required for entry's object classes
@@ -269,7 +269,7 @@
$data->{'localdeliverytype'} = $MailLocalDelivery->{'Type'};
if($data->{'localdeliverytype'} eq 'cyrus' ) {
#setting default quota
- $data->{'suseimapquota'} = $ldapret->[0]->{'suseimapdefaultquota'}->[0];
+ $data->{'suseImapQuota'} = $ldapret->[0]->{'suseImapDefaultQuota'}->[0];
}
# looking for the main mail domain and returns
@@ -292,15 +292,15 @@
if( grep /^UsersPluginMail$/, @{$data->{'plugins_to_remove'}} ) {
my @updated_oc;
- foreach my $oc ( @{$data->{'objectclass'}} ) {
- if ( lc($oc) ne "susemailrecipient" ) {
+ foreach my $oc ( @{$data->{'objectClass'}} ) {
+ if ( lc($oc) ne "suseMailRecipient" ) {
push @updated_oc, $oc;
}
}
- delete( $data->{'suseimapquota'});
+ delete( $data->{'suseImapQuota'});
delete( $data->{'imapquotaused'});
- $data->{'objectclass'} = \@updated_oc;
+ $data->{'objectClass'} = \@updated_oc;
y2debug ("Removed Mail plugin");
y2debug ( Data::Dumper->Dump( [ $data ] ) );
return $data;
@@ -325,7 +325,7 @@
# Only change objectclasses if they are already present (sometimes EditBefore
# is called with an empty $data hash)
- if ( $data->{'objectclass'} ) {
+ if ( $data->{'objectClass'} ) {
$data = update_object_classes ($config, $data);
my $ldapret = get_LDAP_Config();
@@ -357,7 +357,7 @@
y2internal ("Edit Mail called");
y2debug(Dumper($data));
- if ( ! $data->{'suseimapquota'} ) {
+ if ( ! $data->{'suseImapQuota'} ) {
my $tmp_data = cond_IMAP_OP($config, $data, "getquota");
if( $tmp_data ) {
$data = $tmp_data;
@@ -366,15 +366,15 @@
# Has the plugin been removed?
if( grep /^UsersPluginMail$/, @{$data->{'plugins_to_remove'}} ) {
my @updated_oc;
- foreach my $oc ( @{$data->{'objectclass'}} ) {
- if ( lc($oc) ne "susemailrecipient" ) {
+ foreach my $oc ( @{$data->{'objectClass'}} ) {
+ if ( lc($oc) ne "suseMailRecipient" ) {
push @updated_oc, $oc;
}
}
- delete( $data->{'suseimapquota'});
+ delete( $data->{'suseImapQuota'});
delete( $data->{'imapquotaused'});
- $data->{'objectclass'} = \@updated_oc;
+ $data->{'objectClass'} = \@updated_oc;
y2milestone ("Removed Mail plugin");
y2debug ( Data::Dumper->Dump( [ $data ] ) );
@@ -484,7 +484,7 @@
elsif ( ($data->{'what'} =~ /^edit_/ ) && $self->PluginPresent($config, $data) )
{
# create Folder if plugin has been added
- if ( ! grep /^suseMailRecipient$/i, @{$data->{'org_user'}->{'objectclass'}} ) {
+ if ( ! grep /^suseMailRecipient$/i, @{$data->{'org_user'}->{'objectClass'}} ) {
y2milestone("creating INBOX");
cond_IMAP_OP($config, $data, "add") if $action eq "edited";
return;
@@ -520,9 +520,9 @@
# define the object class for new user/groupa
my @orig_object_class = ();
- if (defined $data->{"objectclass"} && ref $data->{"objectclass"} eq "ARRAY")
+ if (defined $data->{"objectClass"} && ref $data->{"objectClass"} eq "ARRAY")
{
- @orig_object_class = @{$data->{"objectclass"}};
+ @orig_object_class = @{$data->{"objectClass"}};
}
foreach my $oc (@default_object_class) {
if (!contains (\@orig_object_class, $oc, 1)) {
@@ -530,7 +530,7 @@
}
}
- $data->{"objectclass"} = \@orig_object_class;
+ $data->{"objectClass"} = \@orig_object_class;
return $data;
}
@@ -539,8 +539,8 @@
my $config = shift;
my $data = shift;
- if( ! contains( $data->{objectclass}, "susemailrecipient", 1) ) {
- push @{$data->{'objectclass'}}, "susemailrecipient";
+ if( ! contains( $data->{objectClass}, "suseMailRecipient", 1) ) {
+ push @{$data->{'objectClass'}}, "suseMailRecipient";
}
if( $config->{'what'} eq 'group' ) {
@@ -553,19 +553,19 @@
return $data;
}
my $mailaddress = $data->{'uid'}."\@".$data->{mainmaildomain};
- if( defined $data->{susemailacceptaddress} ) {
- if( ref($data->{susemailacceptaddress}) eq "ARRAY" &&
- ! contains( $data->{susemailacceptaddress}, $mailaddress, 1) ) {
- push @{$data->{'susemailacceptaddress'}}, $mailaddress;
- } elsif ( ref($data->{susemailacceptaddress}) ne "ARRAY" &&
- $data->{susemailacceptaddress} ne $mailaddress ) {
- my $tmp = $data->{'susemailacceptaddress'};
- $data->{'susemailacceptaddress'} = [];
- push @{$data->{'susemailacceptaddress'}}, $tmp;
- push @{$data->{'susemailacceptaddress'}}, $mailaddress;
+ if( defined $data->{suseMailAcceptAddress} ) {
+ if( ref($data->{suseMailAcceptAddress}) eq "ARRAY" &&
+ ! contains( $data->{suseMailAcceptAddress}, $mailaddress, 1) ) {
+ push @{$data->{'suseMailAcceptAddress'}}, $mailaddress;
+ } elsif ( ref($data->{suseMailAcceptAddress}) ne "ARRAY" &&
+ $data->{suseMailAcceptAddress} ne $mailaddress ) {
+ my $tmp = $data->{'suseMailAcceptAddress'};
+ $data->{'suseMailAcceptAddress'} = [];
+ push @{$data->{'suseMailAcceptAddress'}}, $tmp;
+ push @{$data->{'suseMailAcceptAddress'}}, $mailaddress;
}
} else {
- $data->{susemailacceptaddress} = $mailaddress;
+ $data->{suseMailAcceptAddress} = $mailaddress;
}
return $data;
@@ -577,7 +577,7 @@
# Read mail specific ldapconfig object
my $ldapret = SCR->Read(".ldap.search", {
"base_dn" => $ldapMap->{'base_config_dn'},
- "filter" => '(objectclass=suseMailConfiguration)',
+ "filter" => '(objectClass=suseMailConfiguration)',
"scope" => 2,
"not_found_ok" => 1,
"attrs" => [ 'suseImapServer', 'suseImapAdmin', 'suseImapDefaultQuota' ]
@@ -598,7 +598,7 @@
# read dns configuration data
my $ret = SCR->Read(".ldap.search", {
"base_dn" => $ldapMap->{'base_config_dn'},
- "filter" => '(objectclass=suseDnsConfiguration)',
+ "filter" => '(objectClass=suseDnsConfiguration)',
"scope" => 2,
"not_found_ok" => 1,
"attrs" => [ 'suseDefaultBase' ]
@@ -609,7 +609,7 @@
return undef;
}
if(@$ret > 0) {
- $ldapMap->{'dns_config_dn'} = $ret->[0]->{'susedefaultbase'}->[0];
+ $ldapMap->{'dns_config_dn'} = $ret->[0]->{'suseDefaultBase'}->[0];
} else {
my $ldapERR = SCR->Read(".ldap.error");
$error = "DNS Setup Error: ".$ldapERR->{'code'}." : ".$ldapERR->{'msg'};
@@ -641,7 +641,7 @@
$error = "There are defined more then one main mail domain. Please fix it!";
return undef;
} else {
- $domain = $ret->[0]->{'zonename'}->[0];
+ $domain = $ret->[0]->{'zoneName'}->[0];
}
$data->{'mainmaildomain'} = $domain;
return $data;
@@ -663,13 +663,13 @@
my $ldapret = get_LDAP_Config();
if(@$ldapret > 0) {
- $imapadm = $ldapret->[0]->{'suseimapadmin'}->[0];
- $imaphost = $ldapret->[0]->{'suseimapserver'}->[0];
- #$imapquota = $ldapret->[0]->{'suseimapdefaultquota'}->[0];
+ $imapadm = $ldapret->[0]->{'suseImapAdmin'}->[0];
+ $imaphost = $ldapret->[0]->{'suseImapServer'}->[0];
+ #$imapquota = $ldapret->[0]->{'suseImapDefaultQuota'}->[0];
}
- if ( $data->{'suseimapquota'} ) {
- $imapquota = $data->{'suseimapquota'};
+ if ( $data->{'suseImapQuota'} ) {
+ $imapquota = $data->{'suseImapQuota'};
}
# we need to ensure, that imapadmpw == rootdnpw!
@@ -909,8 +909,8 @@
$proxy_imap->logout();
}
} else {
- if( defined $data->{'suseimapquota'} && $data->{'suseimapquota'} > 0 ) {
- $ret = $imap->setquota($fname, ("STORAGE", $data->{'suseimapquota'} ) );
+ if( defined $data->{'suseImapQuota'} && $data->{'suseImapQuota'} > 0 ) {
+ $ret = $imap->setquota($fname, ("STORAGE", $data->{'suseImapQuota'} ) );
if($$ret{Status} ne "ok") {
y2internal("setquota failed: Serverresponse:$$ret{Status} => $$ret{Text}\n");
$error = "setquota failed: Serverresponse:$$ret{Status} => $$ret{Text}";
@@ -933,7 +933,7 @@
my $self = shift;
my $resp = shift;
- $data->{'suseimapquota'} = $resp->limit("STORAGE");
+ $data->{'suseImapQuota'} = $resp->limit("STORAGE");
$data->{'imapquotaused'} = $resp->usage("STORAGE");
};
Modified: trunk/mail/users-plugin/users_plugin_mail.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/users-plugin/users_plugin_mail.ycp?rev=49378&r1=49377&r2=49378&view=diff
==============================================================================
--- trunk/mail/users-plugin/users_plugin_mail.ycp (original)
+++ trunk/mail/users-plugin/users_plugin_mail.ycp Thu Jul 24 11:34:00 2008
@@ -143,17 +143,17 @@
list<term> result = [];
integer i = 0;
- if( is(data["susemailacceptaddress"]:(any)"", string)
- && size (data["susemailacceptaddress"]:"") > 0 )
+ if( is(data["suseMailAcceptAddress"]:(any)"", string)
+ && size (data["suseMailAcceptAddress"]:"") > 0 )
{
result = [`item (`id (i),
- data["susemailacceptaddress"]:"")];
+ data["suseMailAcceptAddress"]:"")];
// transforming to list
- data["susemailacceptaddress"] = [data["susemailacceptaddress"]:""];
+ data["suseMailAcceptAddress"] = [data["suseMailAcceptAddress"]:""];
}
- else if ( is(data["susemailacceptaddress"]:(any)[], list) )
+ else if ( is(data["suseMailAcceptAddress"]:(any)[], list) )
{
- foreach (string element, data["susemailacceptaddress"]:[], ``{
+ foreach (string element, data["suseMailAcceptAddress"]:[], ``{
result = add (result, `item (`id (i), element));
i = i + 1;
});
@@ -182,7 +182,7 @@
string action = data["what"]:"";
map tmp_data = $[];
- list<string> object_class = (list<string>)sort (data["objectclass"]:[]);
+ list<string> object_class = (list<string>)sort (data["objectClass"]:[]);
// if this plugin wasn't present in default plugin set, we have to call
// BeforeAdd/BeforeEdit e.g. to get object class!
@@ -192,8 +192,8 @@
data = UsersPluginMail::AddBefore (config, data);
else if (action == "edit_user" || action == "edit_group")
data = UsersPluginMail::EditBefore (config, data);
- object_class = (list<string>)sort (data["objectclass"]:[]);
- tmp_data["objectclass"] = object_class;
+ object_class = (list<string>)sort (data["objectClass"]:[]);
+ tmp_data["objectClass"] = object_class;
}
// helptext 1/3
@@ -243,10 +243,10 @@
term imap = `VBox();
integer intimapquota = -1;
- if (haskey (data, "suseimapquota")
- && data["suseimapquota"]:"10000" != nil)
+ if (haskey (data, "suseImapQuota")
+ && data["suseImapQuota"]:"10000" != nil)
{
- intimapquota = tointeger ((string) data["suseimapquota"]:"10000" );
+ intimapquota = tointeger ((string) data["suseImapQuota"]:"10000" );
}
if(data["localdeliverytype"]:"local" == "cyrus" ) {
@@ -306,13 +306,13 @@
{
if (check_mail_address (emailName))
{
- if (contains (data["susemailacceptaddress"]:[], emailName))
+ if (contains (data["suseMailAcceptAddress"]:[], emailName))
{
Popup::Error(_("Entry already exists."));
}
else
{
- data["susemailacceptaddress"] = add (data["susemailacceptaddress"]:[],
+ data["suseMailAcceptAddress"] = add (data["suseMailAcceptAddress"]:[],
emailName);
UI::ChangeWidget(`id(`table), `Items, getEMAILList ());
UI::ChangeWidget(`id(`id_emailname), `Value, "");
@@ -327,25 +327,25 @@
if (ret == `deleteEmail)
{
integer id = (integer) UI::QueryWidget (`id (`table), `CurrentItem);
- data["susemailacceptaddress"] = remove (data["susemailacceptaddress"]:[],
+ data["suseMailAcceptAddress"] = remove (data["suseMailAcceptAddress"]:[],
id);
UI::ChangeWidget(`id(`table), `Items, getEMAILList ());
}
if (ret == `editEmail)
{
integer id = (integer) UI::QueryWidget (`id (`table), `CurrentItem);
- string oldEMAIL = (string)((list) data["susemailacceptaddress"]:[])[id]:"";
+ string oldEMAIL = (string)((list) data["suseMailAcceptAddress"]:[])[id]:"";
string newEMAIL = editEMAIL (oldEMAIL);
- if (contains (data["susemailacceptaddress"]:[], newEMAIL))
+ if (contains (data["suseMailAcceptAddress"]:[], newEMAIL))
{
Popup::Error(_("Entry already exists."));
}
else
{
- data["susemailacceptaddress"] = remove (data["susemailacceptaddress"]:[],
+ data["suseMailAcceptAddress"] = remove (data["suseMailAcceptAddress"]:[],
id);
- data["susemailacceptaddress"] = add (data["susemailacceptaddress"]:[],
+ data["suseMailAcceptAddress"] = add (data["suseMailAcceptAddress"]:[],
newEMAIL);
}
UI::ChangeWidget(`id(`table), `Items, getEMAILList ());
@@ -370,20 +370,20 @@
data["plugins"] = add (data["plugins"]:[],
"UsersPluginMail");
}
- if( size(data["susemailacceptaddress"]:[]) == 1 ) {
- data["susemailacceptaddress"] = ((list)data["susemailacceptaddress"]:[])[0]:"";
- } else if( size(data["susemailacceptaddress"]:[]) == 0 ) {
- remove(data,"susemailacceptaddress");
+ if( size(data["suseMailAcceptAddress"]:[]) == 1 ) {
+ data["suseMailAcceptAddress"] = ((list)data["suseMailAcceptAddress"]:[])[0]:"";
+ } else if( size(data["suseMailAcceptAddress"]:[]) == 0 ) {
+ remove(data,"suseMailAcceptAddress");
}
if(data["localdeliverytype"]:"local" == "cyrus" ) {
if ((boolean) UI::QueryWidget(`id(`enableImpapquota), `Value))
{
- data["suseimapquota"] = (integer) UI::QueryWidget(`id(`imapquota), `Value);
+ data["suseImapQuota"] = (integer) UI::QueryWidget(`id(`imapquota), `Value);
}
else
{
- data["suseimapquota"] = -1;
+ data["suseImapQuota"] = -1;
}
}
if (data["what"]:"" == "edit_user")
Modified: trunk/mail/users-plugin/users_plugin_mail_groups.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/users-plugin/users_plugin_mail_groups.ycp?rev=49378&r1=49377&r2=49378&view=diff
==============================================================================
--- trunk/mail/users-plugin/users_plugin_mail_groups.ycp (original)
+++ trunk/mail/users-plugin/users_plugin_mail_groups.ycp Thu Jul 24 11:34:00 2008
@@ -145,17 +145,17 @@
list<term> result = [];
integer i = 0;
- if( is(data["susemailforwardaddress"]:(any)"", string)
- && size (data["susemailforwardaddress"]:"") > 0 )
+ if( is(data["suseMailForwardAaddress"]:(any)"", string)
+ && size (data["suseMailForwardAaddress"]:"") > 0 )
{
result = [`item (`id (i),
- data["susemailforwardaddress"]:"")];
+ data["suseMailForwardAaddress"]:"")];
// transforming to list
- data["susemailforwardaddress"] = [data["susemailforwardaddress"]:""];
+ data["suseMailForwardAaddress"] = [data["suseMailForwardAaddress"]:""];
}
- else if ( is(data["susemailforwardaddress"]:(any)[], list) )
+ else if ( is(data["suseMailForwardAaddress"]:(any)[], list) )
{
- foreach (string element, data["susemailforwardaddress"]:[], ``{
+ foreach (string element, data["suseMailForwardAaddress"]:[], ``{
result = add (result, `item (`id (i), element));
i = i + 1;
});
@@ -169,16 +169,16 @@
string what = config["what"]:"user";
string action = data["what"]:"";
- if( data["susemailcommand"]:"" != "" ) {
+ if( data["suseMailCommand"]:"" != "" ) {
sharedfolder = true;
}
- if( data["susedeliverytomember"]:"no" == "yes" ) {
+ if( data["suseDeliveryToMember"]:"no" == "yes" ) {
deliverytomember = true;
sharedfolder = false;
}
map tmp_data = $[];
- list<string> object_class = (list<string>)sort (data["objectclass"]:[]);
+ list<string> object_class = (list<string>)sort (data["objectClass"]:[]);
// if this plugin wasn't present in default plugin set, we have to call
// BeforeAdd/BeforeEdit e.g. to get object class!
@@ -188,8 +188,8 @@
data = UsersPluginMail::AddBefore (config, data);
else if (action == "edit_user" || action == "edit_group")
data = UsersPluginMail::EditBefore (config, data);
- object_class = (list<string>)sort (data["objectclass"]:[]);
- tmp_data["objectclass"] = object_class;
+ object_class = (list<string>)sort (data["objectClass"]:[]);
+ tmp_data["objectClass"] = object_class;
}
// helptext 1/3
@@ -233,10 +233,10 @@
term imap = `VBox();
term shared = `VBox();
- integer intimapquota = -1;
- if (haskey (data, "imapquota") && data["imapquota"]:"10000" != nil)
+ integer intimapQuota = -1;
+ if (haskey (data, "imapQuota") && data["imapQuota"]:"10000" != nil)
{
- intimapquota = tointeger ((string) data["imapquota"]:"-1" );
+ intimapQuota = tointeger ((string) data["imapQuota"]:"-1" );
}
shared = `Frame ( _("Delivery of group Mails"),
`VBox(
@@ -253,12 +253,12 @@
imap = `Frame ( _("IMAP Quota"),
`VBox(
`Left(`CheckBox( `id(`sharedfolder), `opt(`notify), _("Enable Shared Folder"), sharedfolder)),
- `Left(`CheckBox( `id(`enableImpapquota ), `opt(`notify), _("Enable IMAP Quota"), intimapquota >= 0)),
+ `Left(`CheckBox( `id(`enableImpapquota ), `opt(`notify), _("Enable IMAP Quota"), intimapQuota >= 0)),
`HBox(
- `IntField (`id(`imapquota), _("in kByte"), 1, 10000000, intimapquota >= 0 ? intimapquota : 10000),
+ `IntField (`id(`imapQuota), _("in kByte"), 1, 10000000, intimapQuota >= 0 ? intimapQuota : 10000),
`HStretch()
),
- `Left(`Label(sformat (_("IMAP quota already in use: %1 kByte"), data["imapquotaused"]:"0" != nil ? data["imapquotaused"]:"0":"0")))
+ `Left(`Label(sformat (_("IMAP quota already in use: %1 kByte"), data["imapQuotaused"]:"0" != nil ? data["imapQuotaused"]:"0":"0")))
)
);
}
@@ -311,17 +311,17 @@
UI::ChangeWidget(`id(`sharedfolder), `Enabled, true);
if( sharedfolder ) {
UI::ChangeWidget(`id(`enableImpapquota), `Enabled, true );
- UI::ChangeWidget(`id(`imapquota), `Enabled, enableImpapquota);
+ UI::ChangeWidget(`id(`imapQuota), `Enabled, enableImpapquota);
} else {
UI::ChangeWidget(`id(`enableImpapquota), `Enabled, false );
- UI::ChangeWidget(`id(`imapquota), `Enabled, false );
+ UI::ChangeWidget(`id(`imapQuota), `Enabled, false );
}
} else {
// If there is no cyrus, we have only delivery to member
deliverytomember = true;
UI::ChangeWidget(`id(`deliverytomember), `Value, deliverytomember);
UI::ChangeWidget(`id(`enableImpapquota), `Enabled, false );
- UI::ChangeWidget(`id(`imapquota), `Enabled, false );
+ UI::ChangeWidget(`id(`imapQuota), `Enabled, false );
}
ret = UI::UserInput();
@@ -334,13 +334,13 @@
{
if (check_mail_address (emailName))
{
- if (contains (data["susemailforwardaddress"]:[], emailName))
+ if (contains (data["suseMailForwardAaddress"]:[], emailName))
{
Popup::Error(_("Entry already exists."));
}
else
{
- data["susemailforwardaddress"] = add (data["susemailforwardaddress"]:[],
+ data["suseMailForwardAaddress"] = add (data["suseMailForwardAaddress"]:[],
emailName);
UI::ChangeWidget(`id(`table), `Items, getEMAILList ());
UI::ChangeWidget(`id(`id_emailname), `Value, "");
@@ -355,41 +355,41 @@
if (ret == `deleteEmail)
{
integer id = (integer) UI::QueryWidget (`id (`table), `CurrentItem);
- data["susemailforwardaddress"] = remove (data["susemailforwardaddress"]:[],
+ data["suseMailForwardAaddress"] = remove (data["suseMailForwardAaddress"]:[],
id);
UI::ChangeWidget(`id(`table), `Items, getEMAILList ());
}
if (ret == `editEmail)
{
integer id = (integer) UI::QueryWidget (`id (`table), `CurrentItem);
- string oldEMAIL = (string)((list) data["susemailforwardaddress"]:[])[id]:"";
+ string oldEMAIL = (string)((list) data["suseMailForwardAaddress"]:[])[id]:"";
string newEMAIL = editEMAIL (oldEMAIL);
- if (contains (data["susemailforwardaddress"]:[], newEMAIL))
+ if (contains (data["suseMailForwardAaddress"]:[], newEMAIL))
{
Popup::Error(_("Entry already exists."));
}
else
{
- data["susemailforwardaddress"] = remove (data["susemailforwardaddress"]:[], id);
- data["susemailforwardaddress"] = add (data["susemailforwardaddress"]:[], newEMAIL);
+ data["suseMailForwardAaddress"] = remove (data["suseMailForwardAaddress"]:[], id);
+ data["suseMailForwardAaddress"] = add (data["suseMailForwardAaddress"]:[], newEMAIL);
}
UI::ChangeWidget(`id(`table), `Items, getEMAILList ());
}
if ( ret == `next )
{
if((boolean) UI::QueryWidget (`id (`deliverytomember), `Value)){
- data["susedeliverytomember"] = "yes";
+ data["suseDeliveryToMember"] = "yes";
} else {
- data["susedeliverytomember"] = "no";
+ data["suseDeliveryToMember"] = "no";
}
// We put it everytime into the LDAP, and the ldap filter control if it is visible
- data["susemailcommand"] = "\"|/usr/bin/formail -I \\\"From \\\" |/usr/lib/cyrus/bin/deliver -r "+data["cn"]:""+" -a cyrus -m "+data["cn"]:""+"\"";
+ data["suseMailCommand"] = "\"|/usr/bin/formail -I \\\"From \\\" |/usr/lib/cyrus/bin/deliver -r "+data["cn"]:""+" -a cyrus -m "+data["cn"]:""+"\"";
// if( (boolean) UI::QueryWidget (`id (`sharedfolder), `Value)) {
-// data["susemailcommand"] = "\"|/usr/bin/formail -I \\\"From \\\" |/usr/lib/cyrus/bin/deliver -r "+data["cn"]:""+" -a cyrus -m "+data["cn"]:""+"\"";
+// data["suseMailCommand"] = "\"|/usr/bin/formail -I \\\"From \\\" |/usr/lib/cyrus/bin/deliver -r "+data["cn"]:""+" -a cyrus -m "+data["cn"]:""+"\"";
// } else {
-// if( data["susemailcommand"]:"" != "" ) {
-// data = remove (data, "susemailcommand");
+// if( data["suseMailCommand"]:"" != "" ) {
+// data = remove (data, "suseMailCommand");
// }
// }
string err = UsersPluginMail::Check ( config, (map) union (data, tmp_data));
@@ -407,20 +407,20 @@
data["plugins"] = add (data["plugins"]:[],
"UsersPluginMail");
}
- if( size(data["susemailforwardaddress"]:[]) == 1 ) {
- data["susemailforwardaddress"] = ((list)data["susemailforwardaddress"]:[])[0]:"";
- } else if( size(data["susemailforwardaddress"]:[]) == 0 ) {
- remove(data,"susemailforwardaddress");
+ if( size(data["suseMailForwardAaddress"]:[]) == 1 ) {
+ data["suseMailForwardAaddress"] = ((list)data["suseMailForwardAaddress"]:[])[0]:"";
+ } else if( size(data["suseMailForwardAaddress"]:[]) == 0 ) {
+ remove(data,"suseMailForwardAaddress");
}
if(data["localdeliverytype"]:"local" == "cyrus" ) {
if ((boolean) UI::QueryWidget(`id(`enableImpapquota), `Value))
{
- data["imapquota"] = (integer) UI::QueryWidget(`id(`imapquota), `Value);
+ data["imapQuota"] = (integer) UI::QueryWidget(`id(`imapQuota), `Value);
}
else
{
- data["imapquota"] = -1;
+ data["imapQuota"] = -1;
}
}
if (data["what"]:"" == "edit_user")
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
